commit obs-service-format_spec_file for openSUSE:Factory
Hello community, here is the log from the commit of package obs-service-format_spec_file for openSUSE:Factory checked in at 2012-02-14 11:25:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-format_spec_file (Old) and /work/SRC/openSUSE:Factory/.obs-service-format_spec_file.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "obs-service-format_spec_file", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-format_spec_file/obs-service-format_spec_file.changes 2012-02-06 13:33:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.obs-service-format_spec_file.new/obs-service-format_spec_file.changes 2012-02-14 11:25:25.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Feb 9 14:32:43 UTC 2012 - coolo@suse.com + +- even more legal updates + +------------------------------------------------------------------- +Thu Feb 9 10:36:01 UTC 2012 - coolo@suse.com + +- fix the whitespace after the preamble + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ licenses_changes.txt ++++++ --- /var/tmp/diff_new_pack.K5Sj9V/_old 2012-02-14 11:25:26.000000000 +0100 +++ /var/tmp/diff_new_pack.K5Sj9V/_new 2012-02-14 11:25:26.000000000 +0100 @@ -298,6 +298,7 @@ Nokia Nokia NPOSL-3.0 NPOSL-3.0 NTP NTP +SUSE-Oasis-Specification-Notice SUSE-Oasis-Specification-Notice OCLC-2.0 OCLC-2.0 ODbL-1.0 ODbL-1.0 OFL-1.1 OFL @@ -339,6 +340,7 @@ IPA see IPA_Font_License_Agreement_v1.0.txt OFL-1.1 SIL Open Font License OFL-1.1 SIL Open Font License 1.1 +SUSE-Sendmail Sendmail License (http://www.sendmail.org/ftp/LICENSE) SimPL-2.0 SimPL-2.0 Sleepycat Sleepycat SPL-1.0 SPL-1.0 @@ -346,7 +348,7 @@ SUSE-TCL License for TCL (Fedora calls this TCL too. SPDX doesn't have it) LPPL-1.3c TeX-License .. Apache-2.0 The Apache Software License -PHP-3.0.1 The PHP License, version 3.01 +PHP-3.01 The PHP License, version 3.01 VSL-1.0 VSL-1.0 W3C W3C W3C W3C Software License @@ -373,4 +375,5 @@ SUSE-Firmware Firmware license, redistributable unmodified SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. Artistic-1.0 or GPL-1.0+ Perl License -SUSE-NonFree NonFree licenses \ No newline at end of file +SUSE-NonFree NonFree licenses +SUSE:NON-OSI-COMPLIANT:GPL-2.0-with-trademark-clause-with-exceptions LiberationFontsLicense \ No newline at end of file ++++++ prepare_spec ++++++ --- /var/tmp/diff_new_pack.K5Sj9V/_old 2012-02-14 11:25:26.000000000 +0100 +++ /var/tmp/diff_new_pack.K5Sj9V/_new 2012-02-14 11:25:26.000000000 +0100 @@ -674,12 +674,14 @@ print "# needsbinariesforbuild\n" if $needsbinariesforbuild; print "# nodebuginfo\n" if $nodebuginfo; print "# icecream $icecreamforbuild\n" if $icecreamforbuild ne ''; -print "\n" if ($needsrootforbuild || $needsbinariesforbuild || $nodebuginfo || $icecreamforbuild ne ''); +#print "\n" if ($needsrootforbuild || $needsbinariesforbuild || $nodebuginfo || $icecreamforbuild ne ''); -while ($oldspec[0] eq "XXXBLANKLINE") { +while ($oldspec[0] eq "XXXBLANKLINE" || $oldspec[0] eq "XXXDOUBLELINE") { shift @oldspec; } +print "\n\n"; + my $license_unique = !grep { $_ ne $main_license } values %seen_licenses; my $groups_unique = !grep { $_ ne $main_group } values %seen_groups; # we need to have unique groups in the spec file as long as we support SLE11 ;( @@ -689,6 +691,7 @@ my $line; while (@oldspec) { $line = shift @oldspec; + if ($line eq "XXXBLANKLINE") { print "\n" unless $oldspec[0] && ($oldspec[0] =~ m/^XXX.*LINE/ || $oldspec[0] =~ /^\s*$/ || $oldspec[0] =~ /^\n/); } elsif ($line eq "XXXDOUBLELINE") { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de