From 99a5bc069be1d93fddc0446faeb2fe5f19e27aa3127595fcbd85df352dd6d95e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 13 Sep 2012 14:39:41 +0000 Subject: [PATCH] - replace ; with and in license tag OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=93 --- licenses_changes.txt | 1 + obs-service-format_spec_file.changes | 5 +++++ prepare_spec | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index 4d0d9b1..c9dfd0b 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -409,6 +409,7 @@ SUSE-QWT-1.0 LGPL-2.1 with clarifications. See http://qwt.sourceforge.net/ SUSE-Redistributable-Content This license can _only_ be used for content (i.e. no code, no documentation). Provided there are no restrictions on free (re)distribution of the content, use this license. SUSE-Firmware is a subset of this category. SUSE-Repoze http://repoze.org/license.html SUSE-Sendmail Sendmail License (http://www.sendmail.org/ftp/LICENSE) +SUSE-SGI-FreeB-2.0 Fedora calls this MIT (it is very similar to the MIT) SUSE-SIP http://www.riverbankcomputing.co.uk/software/sip/license SUSE-SLIB http://www-swiss.ai.mit.edu/~jaffer/SLIB_COPYING.txt SUSE-SNIA-1.0 SNIA Public License (https://fedoraproject.org/wiki/Licensing/SNIA_Public_License) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 4267ef4..c83c7db 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 13 14:39:31 UTC 2012 - coolo@suse.com + +- replace ; with and in license tag + ------------------------------------------------------------------- Mon Sep 3 08:46:29 UTC 2012 - coolo@suse.com diff --git a/prepare_spec b/prepare_spec index 638534a..3e4f813 100644 --- a/prepare_spec +++ b/prepare_spec @@ -200,7 +200,7 @@ sub replace_spdx($) { for (split(/\s*;\s*/, $license)) { push @licenses, replace_spdx_and($_); } - return join(' ; ', @licenses); + return join(' and ', @licenses); } sub set_current_pkg {