Hello community,
here is the log from the commit of package obs-service-format_spec_file for
openSUSE:Factory checked in at 2016-10-10 17:29:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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"
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-format_spec_file/obs-service-format_spec_file.changes
2016-09-05 21:13:44.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-format_spec_file.new/obs-service-format_spec_file.changes
2016-10-10 17:29:13.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Sep 29 11:35:08 CEST 2016 - [email protected]
+
+- Handle needssslcertforbuild directive
+- Handle empty output directory
+- Improve the license and group comments handling
+
+-------------------------------------------------------------------
Old:
----
obs-service-format_spec_file-20160406.tar.bz2
New:
----
obs-service-format_spec_file-20160929.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-format_spec_file.spec ++++++
--- /var/tmp/diff_new_pack.dPWQKf/_old 2016-10-10 17:29:14.000000000 +0200
+++ /var/tmp/diff_new_pack.dPWQKf/_new 2016-10-10 17:29:14.000000000 +0200
@@ -17,7 +17,7 @@
Name: obs-service-format_spec_file
-Version: 20160406
+Version: 20160929
Release: 0
Summary: An OBS source service: reformats a spec file to SUSE standard
License: GPL-2.0
++++++ obs-service-format_spec_file-20160406.tar.bz2 ->
obs-service-format_spec_file-20160929.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-format_spec_file-20160406/format_spec_file
new/obs-service-format_spec_file-20160929/format_spec_file
--- old/obs-service-format_spec_file-20160406/format_spec_file 2016-04-06
21:17:32.000000000 +0200
+++ new/obs-service-format_spec_file-20160929/format_spec_file 2016-09-29
11:34:09.000000000 +0200
@@ -26,6 +26,10 @@
if [ -z "$MYSPECFILES" ]; then
MYSPECFILES=`echo *.spec`
fi
+if [ -z "$MYOUTDIR" ]; then
+ MYOUTDIR=`pwd`
+fi
+
for i in $MYSPECFILES; do
if [ "$i" == '*.spec' ]; then
echo "WARNING: no spec file found"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-format_spec_file-20160406/prepare_spec
new/obs-service-format_spec_file-20160929/prepare_spec
--- old/obs-service-format_spec_file-20160406/prepare_spec 2016-04-06
21:17:32.000000000 +0200
+++ new/obs-service-format_spec_file-20160929/prepare_spec 2016-09-29
11:34:09.000000000 +0200
@@ -19,6 +19,7 @@
my @copyrights = ();
my $needsrootforbuild = 0;
my $needsbinariesforbuild = 0;
+my $needssslcertforbuild = 0;
my $nodebuginfo = 0;
my $vim_modeline;
my $nosrc_result = 0;
@@ -280,6 +281,11 @@
$needsbinariesforbuild = 1;
next;
}
+ if ( /^#\s*needssslcertforbuild\s*$/ ) {
+ $needssslcertforbuild = 1;
+ next;
+ }
+
if ( /^#\s*norootforbuild/ ) {
next;
}
@@ -301,7 +307,7 @@
$c =~
s{\s*(\d+|copyrights?|\(c\)|suse|linux|products|gmbh|nuremberg|n..?rnberg|germany|\W+)\s*}{}gi;
push(@copyrights, $_) if length $c > 5;
last if length $readspec[0] < 10 || $readspec[0] =~ m{modifications and
additions}i || $readspec[0] !~ /^[\#\s]/
- || grep { $readspec[0] =~ /^#\s*$_/ }
("needsrootforbuild","needsbinariesforbuild","nodebuginfo","icecream","usedforbuild","Commandline","MD5SUM","!BuildIgnore");
+ || grep { $readspec[0] =~ /^#\s*$_/ }
("needsrootforbuild","needsbinariesforbuild","needssslcertforbuild",
"nodebuginfo","icecream","usedforbuild","Commandline","MD5SUM","!BuildIgnore");
$_ = shift @readspec;
}
next;
@@ -687,8 +693,9 @@
print "# needsrootforbuild\n" if $needsrootforbuild;
print "# needsbinariesforbuild\n" if $needsbinariesforbuild;
print "# nodebuginfo\n" if $nodebuginfo;
+print "# needssslcertforbuild\n" if $needssslcertforbuild;
print "# icecream $icecreamforbuild\n" if $icecreamforbuild ne '';
-#print "\n" if ($needsrootforbuild || $needsbinariesforbuild || $nodebuginfo
|| $icecreamforbuild ne '');
+#print "\n" if ($needsrootforbuild || $needsbinariesforbuild || $nodebuginfo
|| $icecreamforbuild || $needssslcertforbuild ne '');
while ($oldspec[0] eq "XXXBLANKLINE" || $oldspec[0] eq "XXXDOUBLELINE") {
shift @oldspec;
@@ -713,6 +720,14 @@
} elsif ($line eq "XXXRELEASE") {
printf("%-16s%s\n", "Release:", "0") ;
} elsif ($line =~ m/XXXPOSTSUMMARY (.*)$/) {
+ # There is a chance to have some comments that should appear before
+ # licenses and groups so print them here.
+ $line = shift @oldspec;
+ while ($line =~ m/^#.*/) {
+ print "$line\n";
+ $line = shift @oldspec;
+ }
+ unshift(@oldspec, $line);
my $current_package = $1;
my $license = $seen_licenses{$current_package} || $main_license;
printf("%-16s%s\n", "License:", $license) if $license && (!$license_unique
|| $first_summary || $current_package eq $base_package);
