Hello community,
here is the log from the commit of package obs-service-source_validator for
openSUSE:Factory checked in at 2017-12-03 10:09:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-source_validator (Old)
and /work/SRC/openSUSE:Factory/.obs-service-source_validator.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-source_validator"
Sun Dec 3 10:09:53 2017 rev:42 rq:546415 version:0.7
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-source_validator/obs-service-source_validator.changes
2017-11-01 11:06:21.632957330 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-source_validator.new/obs-service-source_validator.changes
2017-12-03 10:10:01.586394670 +0100
@@ -1,0 +2,9 @@
+Wed Nov 29 12:56:33 UTC 2017 - [email protected]
+
+- Update to version 0.7:
+ * Do not ignore conditionals of the form "%if ... %{name} ..."
+ * Add --keep-name-conditionals option to helpers/spec_query
+ * Do not fail in case of ambiguous source tags
+ * Use priviate --homedir when calling gpg
+
+-------------------------------------------------------------------
Old:
----
obs-service-source_validator-0.6+git20170922.230bbc4.tar.bz2
New:
----
obs-service-source_validator-0.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-source_validator.spec ++++++
--- /var/tmp/diff_new_pack.6ZgssP/_old 2017-12-03 10:10:03.514324575 +0100
+++ /var/tmp/diff_new_pack.6ZgssP/_new 2017-12-03 10:10:03.518324430 +0100
@@ -21,7 +21,7 @@
License: GPL-2.0+
Group: Development/Tools/Building
Url: https://github.com/openSUSE/obs-service-source_validator
-Version: 0.6+git20170922.230bbc4
+Version: 0.7
Release: 0
# use osc service dr to update
Source: %{name}-%{version}.tar.bz2
@@ -33,8 +33,8 @@
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
-Requires: build
Requires: /usr/bin/xmllint
+Requires: build
Requires: perl-TimeDate
Provides: osc-source_validator = %version
Obsoletes: osc-source_validator <= 0.1
++++++ _service ++++++
--- /var/tmp/diff_new_pack.6ZgssP/_old 2017-12-03 10:10:03.562322830 +0100
+++ /var/tmp/diff_new_pack.6ZgssP/_new 2017-12-03 10:10:03.562322830 +0100
@@ -3,9 +3,13 @@
<param
name="url">git://github.com/openSUSE/obs-service-source_validator.git</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
+<!--
<param name="version">git-master</param>
- <param name="versionformat">0.6+git%cd.%h</param>
+ <param name="versionformat">0.7+git%cd.%h</param>
<param name="revision">master</param>
+-->
+ <param name="version">0.7</param>
+ <param name="revision">0.7</param>
<param name="changesgenerate">enable</param>
</service>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.6ZgssP/_old 2017-12-03 10:10:03.582322103 +0100
+++ /var/tmp/diff_new_pack.6ZgssP/_new 2017-12-03 10:10:03.586321957 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">git://github.com/openSUSE/obs-service-source_validator.git</param>
- <param
name="changesrevision">230bbc46562b8e4cc26dcacb4f5c9f46e75d921e</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">1e990f00f4a78d58f1c4252f52ce63c48747f08a</param></service></servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.6ZgssP/_old 2017-12-03 10:10:03.610321085 +0100
+++ /var/tmp/diff_new_pack.6ZgssP/_new 2017-12-03 10:10:03.610321085 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: obs-service-source-validator
-Version: 0.6+git20170922.230bbc4-0
+Version: 0.7-0
Binary: obs-service-source-validator
Maintainer: Hib Eris <[email protected]>
Architecture: all
++++++ obs-service-source_validator-0.6+git20170922.230bbc4.tar.bz2 ->
obs-service-source_validator-0.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-source_validator-0.6+git20170922.230bbc4/20-files-present-and-referenced
new/obs-service-source_validator-0.7/20-files-present-and-referenced
---
old/obs-service-source_validator-0.6+git20170922.230bbc4/20-files-present-and-referenced
2017-09-22 13:18:58.000000000 +0200
+++ new/obs-service-source_validator-0.7/20-files-present-and-referenced
2017-11-16 13:29:35.000000000 +0100
@@ -55,7 +55,7 @@
for i in $DIR_TO_CHECK/*.spec ; do
test -f "$i" || continue
$HELPERS_DIR/spec_query --specfile "$i" --print-sources \
- --no-conditionals --unique-sources \
+ --no-conditionals --keep-name-conditionals --disambiguate-sources \
>> "$TMPDIR/sources" 2>"$TMPDIR/sources.err"
# ignore expand errors with macro scripts
sed -i "/can't expand %(...)/d" "$TMPDIR/sources.err"
@@ -155,7 +155,7 @@
#
if [ -f $DIR_TO_CHECK/*.keyring 2>/dev/null ]; then
- GPG_OPTIONS="-q --no-default-keyring --keyring
$TMPDIR/.checkifvalidsourcedir-gpg-keyring --trust-model always"
+ GPG_OPTIONS="--homedir $TMPDIR -q --no-default-keyring --keyring
$TMPDIR/.checkifvalidsourcedir-gpg-keyring --trust-model always"
gpg $GPG_OPTIONS --import $DIR_TO_CHECK/*.keyring
for i in $DIR_TO_CHECK/*.sig $DIR_TO_CHECK/*.sign $DIR_TO_CHECK/*.asc; do
if [ -f "$i" ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-source_validator-0.6+git20170922.230bbc4/helpers/spec_query
new/obs-service-source_validator-0.7/helpers/spec_query
--- old/obs-service-source_validator-0.6+git20170922.230bbc4/helpers/spec_query
2017-09-22 13:18:58.000000000 +0200
+++ new/obs-service-source_validator-0.7/helpers/spec_query 2017-11-16
13:29:35.000000000 +0100
@@ -14,14 +14,17 @@
# to query certain information from the specfile.
sub prepare_spec {
- my ($fn, $no_conditionals, $unique_sources, $disambiguate_sources) = @_;
+ my ($fn, $no_conditionals, $keep_name_conditionals, $unique_sources,
+ $disambiguate_sources) = @_;
return $fn unless $no_conditionals;
my $spec;
open(F, '<', $fn) || die("open: $!\n");
my %seen;
my $dtags;
while (<F>) {
- next if /^\s*%(?:if|else|endif)/;
+ if (/^\s*%(?:if|else|endif)/) {
+ next unless $keep_name_conditionals && /^\s*%if\s+.*%\{?name/;
+ }
chomp;
if (($unique_sources || $disambiguate_sources) &&
/^\s*((?:Source|Patch)\d*)\s*:(.*)$/i) {
@@ -53,10 +56,10 @@
}
sub parse {
- my ($fn, $arch, $no_conditionals, $unique_sources,
+ my ($fn, $arch, $no_conditionals, $keep_name_conditionals, $unique_sources,
$disambiguate_sources) = @_;
- my $spec = prepare_spec($fn, $no_conditionals, $unique_sources,
- $disambiguate_sources);
+ my $spec = prepare_spec($fn, $no_conditionals, $keep_name_conditionals,
+ $unique_sources, $disambiguate_sources);
my $config = Build::read_config($arch, []);
$config->{'warnings'} = 1;
my $descr = Build::Rpm::parse($config, $spec);
@@ -87,15 +90,18 @@
print <<EOF;
Usage: $0 --specfile <specfile> [<options>]
Options:
- --specfile <specfile>: the specfile that should be queried
- --arch <arch>: arch that is used during parsing (default: noarch)
- --no-conditionals: do not take %if* conditionals into account during
- parsing
- --unique-sources: fail if source/patch tags are not unique
- --disambiguate-sources: disambiguate non-unique source/patch tags (only
- needed for a "pathological" specfile)
- --print-subpacks: print names of the main package and all subpackages
- --print-sources: print names of all sources, patches, and icons
+ --specfile <specfile>: the specfile that should be queried
+ --arch <arch>: arch that is used during parsing (default: noarch)
+ --no-conditionals: do not take %if* conditionals into account during
+ parsing
+ --keep-name-conditionals: take conditionals of the form "%if ... %{name} ..."
+ into account (only useful to restrict the
+ --no-conditionals option)
+ --unique-sources: fail if source/patch tags are not unique
+ --disambiguate-sources: disambiguate non-unique source/patch tags (only
+ needed for a "pathological" specfile)
+ --print-subpacks: print names of the main package and all subpackages
+ --print-sources: print names of all sources, patches, and icons
EOF
exit($ret);
@@ -106,6 +112,7 @@
my $print_subpacks;
my $print_sources;
my $no_conditionals;
+my $keep_name_conditionals;
my $unique_sources;
my $disambiguate_sources;
@@ -123,6 +130,8 @@
$print_sources = 1;
} elsif ($opt eq '--no-conditionals') {
$no_conditionals = 1;
+ } elsif ($opt eq '--keep-name-conditionals') {
+ $keep_name_conditionals = 1;
} elsif ($opt eq '--unique-sources') {
$unique_sources = 1;
} elsif ($opt eq '--disambiguate-sources') {
@@ -134,7 +143,7 @@
}
}
-my $descr = parse($specfile, $arch, $no_conditionals, $unique_sources,
- $disambiguate_sources);
+my $descr = parse($specfile, $arch, $no_conditionals, $keep_name_conditionals,
+ $unique_sources, $disambiguate_sources);
print_subpacks($descr) if $print_subpacks;
print_sources($descr) if $print_sources;
