Hello community,
here is the log from the commit of package osc-source_validator for
openSUSE:Factory
checked in at Tue May 10 09:14:30 CEST 2011.
--------
--- osc-source_validator/osc-source_validator.changes 2011-04-18
01:07:34.000000000 +0200
+++
/mounts/work_src_done/STABLE/osc-source_validator/osc-source_validator.changes
2011-05-09 15:47:38.000000000 +0200
@@ -1,0 +2,11 @@
+Mon May 9 13:47:29 UTC 2011 - [email protected]
+
+- try to fix bnc#679980
+
+-------------------------------------------------------------------
+Wed Apr 20 17:30:19 CEST 2011 - [email protected]
+
+- find another form of commenting out patches
+ in check_patches_applied
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ osc-source_validator.spec ++++++
--- /var/tmp/diff_new_pack.o6DrKj/_old 2011-05-10 09:13:53.000000000 +0200
+++ /var/tmp/diff_new_pack.o6DrKj/_new 2011-05-10 09:13:53.000000000 +0200
@@ -19,7 +19,7 @@
Name: osc-source_validator
Version: 0.1
-Release: 14
+Release: 16
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-04-18 01:02:49.000000000 +0200
+++ new/osc-source_validator-0.1/20-files-present-and-referenced
2011-05-09 15:45:41.000000000 +0200
@@ -96,9 +96,10 @@
/^Supplements/d
/^Suggests/d
/^Enhances/d
- s/^\([Ss]ource\|[Pp]atch\)[0-9]*:[ ]*/%{echo:/
- s/^Release:.*<RELEASE.*>/Release: 0/
- /^%{echo:/s/$/ }/' $i >$TMPDIR/tmp.spec
+ /^\([Ss]ource\|[Pp]atch\)[0-9]*:[ ]*/{
+ s/^\(\([Ss]ource\|[Pp]atch\)[0-9]*:[
]*\)\(.*\)/##seen \1\3\n%{echo:\3 }/
+ }
+ s/^Release:.*<RELEASE.*>/Release: 0/' $i >$TMPDIR/tmp.spec
grep -a ^Icon: $i|sed -n 's/^Icon:[ ]*/%{echo:/
/^%{echo:/s/$/ }/p' >>$TMPDIR/tmp.spec
grep -a -q ^Release $i || {
@@ -109,6 +110,9 @@
-gt `grep -a "^%endif" $TMPDIR/tmp.spec | wc -l` ; do
echo "%endif" >> $TMPDIR/tmp.spec
done
+ while read line ; do
+ grep -qx "##seen $line" $TMPDIR/tmp.spec || echo "$line" | sed -e
"s/^\(\([Ss]ource\|[Pp]atch\)[0-9]*:[ ]*\)\(.*\)/##seen \1\3\n%{echo:\3 }/"
>> $TMPDIR/tmp.spec
+ 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
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-04-18
01:02:49.000000000 +0200
+++ new/osc-source_validator-0.1/helpers/check_patches_applied 2011-05-09
15:45:41.000000000 +0200
@@ -37,7 +37,7 @@
$PATCHES_COMMENTED[$front] = 1 if $commented;
next;
}
- if (/^(#.*)?%[Pp]atch/) {
+ if (/^(#.*)?%[Pp]atch/ || /^#[Pp]atch/) {
my $applied = (/^#/) ? 2 :1;
my @line = split (/\s+/,$_);
my $had_P = grep {/^-P/} @line;
@@ -64,8 +64,8 @@
$arg = 0;
$APPLIED[$arg] = $applied unless $APPLIED[$arg];
}
- } elsif ($arg =~ /^(#.*)?%[Pp]atch/) {
- $arg =~ s/^(#.*)?%[Pp]atch//;
+ } elsif ($arg =~ /^(#.*)?%?[Pp]atch/) {
+ $arg =~ s/^(#.*)?%?[Pp]atch//;
if ($arg =~ /^[0-9]/) {
$APPLIED[$arg] = $applied unless $APPLIED[$arg];
} else {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
