Hello community, here is the log from the commit of package osc-source_validator for openSUSE:Factory checked in at Mon Jul 11 15:47:53 CEST 2011. -------- --- osc-source_validator/osc-source_validator.changes 2011-05-09 15:47:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/osc-source_validator/osc-source_validator.changes 2011-07-01 17:12:49.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Jul 1 17:12:32 CEST 2011 - ro@suse.de + +- prevent dupes for Release and Version along with Name + +------------------------------------------------------------------- +Mon May 30 11:53:53 CEST 2011 - ro@suse.de + +- fix bug with "Patch" in comments + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc-source_validator.spec ++++++ --- /var/tmp/diff_new_pack.XIdxRt/_old 2011-07-11 15:46:47.000000000 +0200 +++ /var/tmp/diff_new_pack.XIdxRt/_new 2011-07-11 15:46:47.000000000 +0200 @@ -19,7 +19,7 @@ Name: osc-source_validator Version: 0.1 -Release: 16 +Release: 18 License: GPLv2+ Summary: osc source validator Url: http://en.opensuse.org/openSUSE:Build_Service_Tools#OSC_source_validator ++++++ osc-source_validator-0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-source_validator-0.1/20-files-present-and-referenced new/osc-source_validator-0.1/20-files-present-and-referenced --- old/osc-source_validator-0.1/20-files-present-and-referenced 2011-05-09 15:45:41.000000000 +0200 +++ new/osc-source_validator-0.1/20-files-present-and-referenced 2011-07-01 17:11:25.000000000 +0200 @@ -115,8 +115,10 @@ done < <(grep -E "^Source:|^Source[0-9]*:|^Patch:|^Patch[0-9]*:" $i) echo "%description" >> $TMPDIR/tmp.spec - # hack for really strange specfiles with more than one Name: line - sed -e "s@^Name:@XName:@" -e "0,/^XName:/{s@^XName:@Name:@}" -e "s@^XName:.*@@" $TMPDIR/tmp.spec > $TMPDIR/tmp.spec.2 && mv $TMPDIR/tmp.spec.2 $TMPDIR/tmp.spec + # hack for really strange specfiles with more than one Name:/Release:/Version: line + for nodup in Name Version Release ; do + sed -e "s@^$nodup:@X$nodup:@" -e "0,/^X$nodup:/{s@^X$nodup:@$nodup:@}" -e "s@^X$nodup:.*@@" $TMPDIR/tmp.spec > $TMPDIR/tmp.spec.2 && mv $TMPDIR/tmp.spec.2 $TMPDIR/tmp.spec + done $RPMBUILD -bp $TMPDIR/tmp.spec 2>>$TMPDIR/sources || { $RPMBUILD -bp $TMPDIR/tmp.spec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-source_validator-0.1/helpers/check_patches_applied new/osc-source_validator-0.1/helpers/check_patches_applied --- old/osc-source_validator-0.1/helpers/check_patches_applied 2011-05-09 15:45:41.000000000 +0200 +++ new/osc-source_validator-0.1/helpers/check_patches_applied 2011-07-01 17:11:25.000000000 +0200 @@ -1,10 +1,15 @@ #!/usr/bin/perl -w my $batchmode = 0; +my $debug = 0; if ($ARGV[0] eq "--batchmode") { $batchmode = 1; shift; } +if ($ARGV[0] eq "--debug") { + $debug = 1; + shift; +} my $filename = $ARGV[0]; $filename =~ s/^.*///g; @@ -49,6 +54,7 @@ $APPLIED[$arg] = $applied; } else { print STDERR "$col_red(E) %patch -P without following numeric argument$col_norm\n"; + print STDERR "line was $_\n" if $debug; $errors++; } } elsif ($arg =~ /^-P/) { @@ -57,6 +63,7 @@ $APPLIED[$arg] = $applied unless $APPLIED[$arg]; } else { print STDERR "$col_red(E) %patch -P without following numeric argument$col_norm\n"; + print STDERR "line was $_\n" if $debug; $errors++; } } elsif ($arg =~ /^(#.*)?%[Pp]atch$/) { @@ -64,12 +71,13 @@ $arg = 0; $APPLIED[$arg] = $applied unless $APPLIED[$arg]; } - } elsif ($arg =~ /^(#.*)?%?[Pp]atch/) { + } elsif ($arg =~ /^(#.*)?%?patch[^-]/ || $arg =~ /^(#.*)?%?Patch[^-].*:.*/) { $arg =~ s/^(#.*)?%?[Pp]atch//; if ($arg =~ /^[0-9]/) { $APPLIED[$arg] = $applied unless $APPLIED[$arg]; } else { print STDERR "$col_red(E) %patchZZZ without following numeric argument$col_norm\n"; + print STDERR "line was $_\n" if $debug; $errors++; } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org