Accepting request 344706 from devel:openSUSE:Factory:rpmlint

- Update to version 13.2+git20151113.ff9879a:
  + adjust for tmpfiles fix

- fix TmpFilesCheck not finding pattern in the full script
  (fix-TmpFilesCheck-pattern-match.diff)

OBS-URL: https://build.opensuse.org/request/show/344706
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=243

README.packaging.txt

@@ -1,3 +1,10 @@
+= rpmlint =
+
+The patches for rpmlint can be managed in git. That is especially
+useful when rebasing to a new rpmlint version. Read update_git.sh
+
+= rpmlint-checks, rpmlint-tests =
+
 The files from rpmlint-checks and rpmlint-tests managed in git. If
 you need to make changes, you have the following options:
 * Make them in git and update the package from git (you can file

_servicedata

@@ -1,6 +1,6 @@
 <servicedata>
 <service name="tar_scm">
             <param name="url">http://github.com/openSUSE/rpmlint-tests.git</param>
-          <param name="changesrevision">e8d62606360ce2fdd5c8e19bb83d21c04ef3c883</param></service><service name="tar_scm">
+          <param name="changesrevision">ff9879acb697f55844553e6865366fc6d029b546</param></service><service name="tar_scm">
             <param name="url">http://github.com/openSUSE/rpmlint-checks.git</param>
           <param name="changesrevision">d0808a2802827878acce9ea1e7a1c6226ac79f95</param></service></servicedata>

fix-TmpFilesCheck-pattern-match.diff

@@ -0,0 +1,24 @@
+From: Ludwig Nussel <ludwig.nussel@suse.de>
+Date: Fri, 13 Nov 2015 12:56:25 +0100
+Subject: [PATCH] fix TmpFilesCheck pattern match
+
+need to use search() instead of match() find the systemd-tmpfiles call
+---
+ TmpFilesCheck.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/TmpFilesCheck.py b/TmpFilesCheck.py
+index 06be7bb..d1ef824 100644
+--- a/TmpFilesCheck.py
++++ b/TmpFilesCheck.py
+@@ -43,8 +43,8 @@ class TmpFilesCheck(AbstractCheck.AbstractCheck):
+                 continue
+ 
+             pattern = re.compile(r'systemd-tmpfiles --create .*%s'%re.escape(fn))
+-            if (not postin or not pattern.match(postin)) and \
+-                    (not prein or not pattern.match(prein)):
++            if (not postin or not pattern.search(postin)) and \
++                    (not prein or not pattern.search(prein)):
+                 printWarning(pkg,
+                              'postin-without-tmpfile-creation', fn)
+ 

rpmlint-tests-13.2+git20151110.e8d6260.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f267f24a614b7cb16572065ed2d5f7544056ca0f53ce1cacdb36d30d87be276f
-size 10684

rpmlint-tests-13.2+git20151113.ff9879a.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9327ab554812bd6c50cb322ca7c314fa488a7ca19c67bc2a052b48f14ab9b2b
+size 10688

rpmlint-tests.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 13 12:27:11 UTC 2015 - lnussel@suse.de
+
+- Update to version 13.2+git20151113.ff9879a:
+  + adjust for tmpfiles fix
+
 -------------------------------------------------------------------
 Tue Nov 10 12:39:01 UTC 2015 - lnussel@suse.de
 

rpmlint-tests.spec

@@ -22,7 +22,7 @@
 BuildRequires:  rpmlint-mini
 
 Name:           rpmlint-tests
-Version:        13.2+git20151110.e8d6260
+Version:        13.2+git20151113.ff9879a
 Release:        0
 Summary:        rpmlint regression tests
 License:        SUSE-Public-Domain

rpmlint.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 13 12:24:38 UTC 2015 - lnussel@suse.de
+
+- fix TmpFilesCheck not finding pattern in the full script
+  (fix-TmpFilesCheck-pattern-match.diff)
+
 -------------------------------------------------------------------
 Mon Nov  9 12:40:53 UTC 2015 - krahmer@suse.com
 

rpmlint.spec

@@ -110,8 +110,9 @@ Patch51:        add-check-for-tmpfiles-created-at-r.diff
 Patch52:        fix-ghost-file-handling.diff
 Patch53:        remove-files-attr-not-set-check.diff
 Patch54:        move-ghost-file-check-to-TmpFilesCh.diff
+Patch55:        fix-TmpFilesCheck-pattern-match.diff
 # PATCHLIST END
-# BuildArch must at the and. is a bug: https://bugzilla.suse.com/show_bug.cgi?id=926766
+# BuildArch must at the end. is a bug: https://bugzilla.suse.com/show_bug.cgi?id=926766
 BuildArch:      noarch
 
 %py_requires

update_git.sh

@@ -30,6 +30,8 @@ trap cleanup EXIT
 GIT_DIR=`mktemp -d --tmpdir update_git.XXXXXXXXXX`
 CMP_DIR=`mktemp -d --tmpdir update_git.XXXXXXXXXX`
 
+rm -f .update_git.*
+
 if [ -d "$GIT_LOCAL_TREE" ]; then
     echo "Processing $GIT_BRANCH branch of local git tree, using tag:" \
          "$GIT_UPSTREAM_TAG"
@@ -87,7 +89,7 @@ for i in $CMP_DIR/*.tmp; do
     else
 	mv "$CMP_DIR/$newname" "$localname"
 	let ADDED_COUNT+=1
-	echo "  $localname" >> qemu.changes.added
+	echo "  $localname" >> .update_git.changes.added
 	osc add "$localname"
     fi
 done
@@ -104,7 +106,7 @@ for patch in *.diff; do
     if [ -z "$keep" ]; then
 	osc rm --force $patch
 	let DELETED_COUNT+=1
-	echo "  $patch" >> qemu.changes.deleted
+	echo "  $patch" >> .update_git.changes.deleted
     fi
 done
 
@@ -128,25 +130,20 @@ for package in rpmlint; do
     done < $package.spec > $package.spec.new
     mv $package.spec.new $package.spec
 
-    if [ -e qemu.changes.deleted ]; then
+    if [ -e .update_git.changes.deleted ]; then
 	echo "* Patches dropped:" >> $package.changes.proposed
-	cat qemu.changes.deleted  >> $package.changes.proposed
+	cat .update_git.changes.deleted  >> $package.changes.proposed
     fi
-    if [ -e qemu.changes.added ]; then
+    if [ -e .update_git.changes.added ]; then
 	echo "* Patches added:" >> $package.changes.proposed
-	cat qemu.changes.added  >> $package.changes.proposed
+	cat .update_git.changes.added  >> $package.changes.proposed
     fi
     if [ -e $package.changes.proposed ]; then
 	osc vc --file=$package.changes.proposed $package
 	rm -f $package.changes.proposed
     fi
 done
-if [ -e qemu.changes.deleted ]; then
+rm -f .update_git.*
-    rm -f qemu.changes.deleted
-fi
-if [ -e qemu.changes.added ]; then
-    rm -f qemu.changes.added
-fi
 echo "git patch summary"
 echo "  unchanged: $UNCHANGED_COUNT"
 echo "    changed: $CHANGED_COUNT"