Accepting request 134173 from openSUSE:Tools

- replace ; with and in license tag

OBS-URL: https://build.opensuse.org/request/show/134173
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-format_spec_file?expand=0&rev=38
This commit is contained in:
Ismail Dönmez 2012-09-14 10:32:08 +00:00 committed by Git OBS Bridge
commit 85308b1521
3 changed files with 7 additions and 1 deletions

View File

@ -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-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-Repoze http://repoze.org/license.html
SUSE-Sendmail Sendmail License (http://www.sendmail.org/ftp/LICENSE) 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-SIP http://www.riverbankcomputing.co.uk/software/sip/license
SUSE-SLIB http://www-swiss.ai.mit.edu/~jaffer/SLIB_COPYING.txt 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) SUSE-SNIA-1.0 SNIA Public License (https://fedoraproject.org/wiki/Licensing/SNIA_Public_License)

View File

@ -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 Mon Sep 3 08:46:29 UTC 2012 - coolo@suse.com

View File

@ -200,7 +200,7 @@ sub replace_spdx($) {
for (split(/\s*;\s*/, $license)) { for (split(/\s*;\s*/, $license)) {
push @licenses, replace_spdx_and($_); push @licenses, replace_spdx_and($_);
} }
return join(' ; ', @licenses); return join(' and ', @licenses);
} }
sub set_current_pkg { sub set_current_pkg {