Hello community,
here is the log from the commit of package obs-service-source_validator for
openSUSE:Factory checked in at 2019-12-10 22:41:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-source_validator (Old)
and /work/SRC/openSUSE:Factory/.obs-service-source_validator.new.4691
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-source_validator"
Tue Dec 10 22:41:52 2019 rev:49 rq:754613 version:0.19
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-source_validator/obs-service-source_validator.changes
2018-06-27 10:18:19.378802041 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-source_validator.new.4691/obs-service-source_validator.changes
2019-12-10 22:42:00.629818303 +0100
@@ -1,0 +2,11 @@
+Fri Dec 6 08:27:40 UTC 2019 - Adrian Schröter <adr...@suse.de>
+
+- Update to version 0.19:
+ * allow _multibuild to handle multiple specs
+ * The --buildflavor option was missing from the help output
+ * 70-baselibs: do not run subshells
+ * allow -MACRO ending for changes file on multibuild setups
+ * skip source files checks for product definition directories
+ * Add missing dependency to the debian/control file
+
+-------------------------------------------------------------------
Old:
----
obs-service-source_validator-0.18.tar.bz2
New:
----
obs-service-source_validator-0.19.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-source_validator.spec ++++++
--- /var/tmp/diff_new_pack.XHqK83/_old 2019-12-10 22:42:01.145818111 +0100
+++ /var/tmp/diff_new_pack.XHqK83/_new 2019-12-10 22:42:01.149818110 +0100
@@ -1,7 +1,7 @@
#
# spec file for package obs-service-source_validator
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -21,7 +21,7 @@
License: GPL-2.0-or-later
Group: Development/Tools/Building
Url: https://github.com/openSUSE/obs-service-source_validator
-Version: 0.18
+Version: 0.19
Release: 0
# use osc service dr to update
Source: %{name}-%{version}.tar.bz2
@@ -57,6 +57,7 @@
:
%install
+mkdir -p %{buildroot}%{_datadir}/licenses
%makeinstall
%check
@@ -65,6 +66,9 @@
%files
%defattr(-,root,root)
%license COPYING
+%if 0%{?suse_version} <= 1320
+%dir %{_datadir}/licenses
+%endif
%dir /usr/lib/obs
/usr/lib/obs/service
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.XHqK83/_old 2019-12-10 22:42:01.201818091 +0100
+++ /var/tmp/diff_new_pack.XHqK83/_new 2019-12-10 22:42:01.201818091 +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">e9ce13b96ed8141466e39eb28271db52ef59219a</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">b5941812e4d48350a00dfdf8d3c5ce3e74025ade</param></service></servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.XHqK83/_old 2019-12-10 22:42:01.221818083 +0100
+++ /var/tmp/diff_new_pack.XHqK83/_new 2019-12-10 22:42:01.221818083 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: obs-service-source-validator
-Version: 0.18-0
+Version: 0.19-0
Binary: obs-service-source-validator
Maintainer: Hib Eris <h...@hiberis.nl>
Architecture: all
++++++ obs-service-source_validator-0.18.tar.bz2 ->
obs-service-source_validator-0.19.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-source_validator-0.18/10-multibuild_xor_multispec
new/obs-service-source_validator-0.19/10-multibuild_xor_multispec
--- old/obs-service-source_validator-0.18/10-multibuild_xor_multispec
2018-06-25 10:42:02.000000000 +0200
+++ new/obs-service-source_validator-0.19/10-multibuild_xor_multispec
1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-test "$1" = "--verbose" && { VERBOSE=true ; shift ; }
-test "$1" = "--batchmode" && { BATCHMODE=true ; shift ; }
-DIR_TO_CHECK=$1
-DESTINATIONDIR=$2
-test -n "$DIR_TO_CHECK" || DIR_TO_CHECK=`pwd`
-HELPERS_DIR="/usr/lib/obs/service/source_validators/helpers"
-$HELPERS_DIR/check_input_filename "$DIR_TO_CHECK" || exit 1
-test -z "$DESTINATIONDIR" -a -d "$DIR_TO_CHECK/.osc" &&
DESTINATIONDIR="$DIR_TO_CHECK/.osc"
-
-
-RETURN=0
-
-if [ -f "$DIR_TO_CHECK/_multibuild" -a $(ls -1 "$DIR_TO_CHECK/"*.spec | wc -l)
-gt 1 ]; then
- echo "ERROR: we support EITHER _multibuild OR multiple spec files. Do
not add both"
- RETURN=1
-fi
-
-exit $RETURN
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-source_validator-0.18/20-files-present-and-referenced
new/obs-service-source_validator-0.19/20-files-present-and-referenced
--- old/obs-service-source_validator-0.18/20-files-present-and-referenced
2018-06-25 10:42:02.000000000 +0200
+++ new/obs-service-source_validator-0.19/20-files-present-and-referenced
2019-12-06 09:26:39.000000000 +0100
@@ -362,6 +362,7 @@
SEARCHTERM=${BASE//\\/\\\\}
grep -a -x "$SEARCHTERM" $TMPDIR/sources > /dev/null && continue
test -f $DIR_TO_CHECK/_service && egrep -q 'mode=.remoterun'
$DIR_TO_CHECK/_service && continue
+ test -f $DIR_TO_CHECK/_service && egrep -q
'name=.product_converter' $DIR_TO_CHECK/_service && continue
# be a bit more relaxed for osc, it won't upload directories anyway
[ -d "$DIR_TO_CHECK/$BASE" ] && [ -d $DIR_TO_CHECK/.osc ] &&
continue
# and source services on server side
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-source_validator-0.18/45-stale-changes
new/obs-service-source_validator-0.19/45-stale-changes
--- old/obs-service-source_validator-0.18/45-stale-changes 2018-06-25
10:42:02.000000000 +0200
+++ new/obs-service-source_validator-0.19/45-stale-changes 2019-12-06
09:26:39.000000000 +0100
@@ -13,6 +13,11 @@
RETURN=0
test "$VERBOSE" = true && echo -n "- checking for stale or missing changes "
+test -f $DIR_TO_CHECK/_service && egrep -q 'name=.product_converter'
$DIR_TO_CHECK/_service && {
+ test "$VERBOSE" = true && echo skipped for product
+ exit 0
+}
+
print_specs () {
for i in "$DIR_TO_CHECK"/*.spec; do
# PASS if we have trouble parsing the .spec file
@@ -27,10 +32,15 @@
}
SPECLIST=`print_specs | sort -u`
+DO_PASS=""
test -n "$SPECLIST" && {
for i in $SPECLIST ; do
- test -f $DIR_TO_CHECK/$i.changes || {
+ case $i in
+ *-) i=${i}MACRO ; DO_PASS="1"
+ ;;
+ esac
+ test -f $DIR_TO_CHECK/$i.changes -o "$DO_PASS" = "1" || {
echo "WARNING: $i.changes does not exist. This package can not be
submitted to openSUSE product projects."
exit 0
}
@@ -42,6 +52,10 @@
OKAY=0
for pack in $SPECLIST ; do
test "$pack" = "$N" && OKAY=1
+ case $pack in
+ *-) test "${pack}MACRO" = "$N" && OKAY=1
+ ;;
+ esac
done
if test $OKAY = 0 ; then
if ! grep -q "^Source[0-9]*:.*$N.changes" $DIR_TO_CHECK/*.spec ; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-source_validator-0.18/70-baselibs
new/obs-service-source_validator-0.19/70-baselibs
--- old/obs-service-source_validator-0.18/70-baselibs 2018-06-25
10:42:02.000000000 +0200
+++ new/obs-service-source_validator-0.19/70-baselibs 2019-12-06
09:26:39.000000000 +0100
@@ -20,14 +20,13 @@
BUILTBINARIES=()
if [ -e "$DIR_TO_CHECK/_multibuild" ]; then
- sed -n -e 's,.*<\(flavor\|package\)>\([^<]*\)</\(flavor\|package\)>.*,\2,p' \
- "$DIR_TO_CHECK/_multibuild" | while read i; do
- # PASS if we have trouble parsing the .spec file
- BUILTBINARIES+=($($HELPERS_DIR/spec_query --specfile
"$DIR_TO_CHECK"/*.spec --print-subpacks \
- --buildflavor $i)) || exit 0
- BUILTBINARIES+=($($HELPERS_DIR/spec_query --no-conditionals --specfile
"$DIR_TO_CHECK"/*.spec --print-subpacks \
- --buildflavor $i)) || exit 0
- done
+ while read i; do
+ # PASS if we have trouble parsing the .spec file
+ BUILTBINARIES+=($($HELPERS_DIR/spec_query --specfile
"$DIR_TO_CHECK"/*.spec --print-subpacks \
+ --buildflavor $i)) || exit 0
+ BUILTBINARIES+=($($HELPERS_DIR/spec_query --no-conditionals --specfile
"$DIR_TO_CHECK"/*.spec --print-subpacks \
+ --buildflavor $i)) || exit 0
+ done < <(sed -n -e
's,.*<\(flavor\|package\)>\([^<]*\)</\(flavor\|package\)>.*,\2,p'
"$DIR_TO_CHECK/_multibuild")
fi
for i in "$DIR_TO_CHECK"/*.spec; do
# PASS if we have trouble parsing the .spec file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-source_validator-0.18/debian/control
new/obs-service-source_validator-0.19/debian/control
--- old/obs-service-source_validator-0.18/debian/control 2018-06-25
10:42:02.000000000 +0200
+++ new/obs-service-source_validator-0.19/debian/control 2019-12-06
09:26:39.000000000 +0100
@@ -8,6 +8,7 @@
Package: obs-service-source-validator
Architecture: all
+Depends: build | obs-build
Description: An OBS source service: running all the osc source-validator checks
This is a source service for openSUSE Build Service.
.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-source_validator-0.18/helpers/spec_query
new/obs-service-source_validator-0.19/helpers/spec_query
--- old/obs-service-source_validator-0.18/helpers/spec_query 2018-06-25
10:42:02.000000000 +0200
+++ new/obs-service-source_validator-0.19/helpers/spec_query 2019-12-06
09:26:39.000000000 +0100
@@ -125,6 +125,7 @@
Options:
--specfile <specfile>: the specfile that should be queried
--arch <arch>: arch that is used during parsing (default: noarch)
+ --buildflavor <flavor>: multibuild flavor that is used during parsing
(default: empty)
--no-conditionals: do not take %if* conditionals into account during
parsing (except if they are used in line
continuation contexts)
