diff --git a/_servicedata b/_servicedata index fa773a0..90e623a 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ http://github.com/openSUSE/rpmlint-tests.git - ff9879acb697f55844553e6865366fc6d029b546 + 4729923f273ab92d45fa4262ff1ce259acd3aa63 http://github.com/openSUSE/rpmlint-checks.git d0808a2802827878acce9ea1e7a1c6226ac79f95 \ No newline at end of file diff --git a/fix-shared-library-matching.diff b/fix-shared-library-matching.diff new file mode 100644 index 0000000..ccada3a --- /dev/null +++ b/fix-shared-library-matching.diff @@ -0,0 +1,34 @@ +From: Some One +Date: Thu, 9 Apr 2015 14:55:39 +0200 +Subject: [PATCH] fix shared library matching + +Avoids e.g. +[ 332s] glib2-devel.i586: E: library-without-ldconfig-postun (Badness: 300) /usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.4600.1-gdb.py +--- + FilesCheck.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/FilesCheck.py b/FilesCheck.py +index 81c5680..622b3b3 100644 +--- a/FilesCheck.py ++++ b/FilesCheck.py +@@ -615,7 +615,9 @@ buildconfig_rpath_regex = re.compile('(?:-rpath|Wl,-R)\\b') + sofile_regex = re.compile('/lib(64)?/(.+/)?lib[^/]+\.so$') + devel_regex = re.compile('(.*)-(debug(info)?|devel|headers|source|static)$') + debuginfo_package_regex = re.compile('-debug(info)?$') +-lib_regex = re.compile('lib(64)?/lib[^/]*(\.so\..*|-[0-9.]+\.so)') ++# matches properly versioned shared libraries like libfoo.so.1.2.3 as well as ++# weird ones like libfoo-1.2.3.so ++lib_regex = re.compile('/lib(?:64)?/lib[^/]*(?:\.so\.[\d.]+|-[\d.]+\.so)$') + ldconfig_regex = re.compile('^[^#]*ldconfig', re.MULTILINE) + depmod_regex = re.compile('^[^#]*depmod', re.MULTILINE) + install_info_regex = re.compile('^[^#]*install-info', re.MULTILINE) +@@ -1018,7 +1020,7 @@ class FilesCheck(AbstractCheck.AbstractCheck): + + # check ldconfig call in %post and %postun + if lib_regex.search(f): +- if devel_pkg: ++ if devel_pkg and not (sofile_regex.search(f) and stat.S_ISLNK(mode)): + printError(pkg, 'non-devel-file-in-devel-package', f) + if not postin: + printError(pkg, 'library-without-ldconfig-postin', f) diff --git a/rpmlint-tests-13.2+git20151113.ff9879a.tar.xz b/rpmlint-tests-13.2+git20151113.ff9879a.tar.xz deleted file mode 100644 index e07bd10..0000000 --- a/rpmlint-tests-13.2+git20151113.ff9879a.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9327ab554812bd6c50cb322ca7c314fa488a7ca19c67bc2a052b48f14ab9b2b -size 10688 diff --git a/rpmlint-tests-13.2+git20151130.4729923.tar.xz b/rpmlint-tests-13.2+git20151130.4729923.tar.xz new file mode 100644 index 0000000..35fcbd3 --- /dev/null +++ b/rpmlint-tests-13.2+git20151130.4729923.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9840854b1af2a978eb2c6c0ec7154e6f769b6e005acc143cc7374873df0d4b77 +size 11004 diff --git a/rpmlint-tests.changes b/rpmlint-tests.changes index 2a82ce0..5e24945 100644 --- a/rpmlint-tests.changes +++ b/rpmlint-tests.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 30 13:28:53 UTC 2015 - lnussel@suse.de + +- Update to version 13.2+git20151130.4729923: + + add shared library tests + ------------------------------------------------------------------- Fri Nov 13 12:27:11 UTC 2015 - lnussel@suse.de diff --git a/rpmlint-tests.spec b/rpmlint-tests.spec index a5fd233..754c4bc 100644 --- a/rpmlint-tests.spec +++ b/rpmlint-tests.spec @@ -22,7 +22,7 @@ BuildRequires: rpmlint-mini Name: rpmlint-tests -Version: 13.2+git20151113.ff9879a +Version: 13.2+git20151130.4729923 Release: 0 Summary: rpmlint regression tests License: SUSE-Public-Domain diff --git a/rpmlint.changes b/rpmlint.changes index 6505f19..7aef114 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 30 13:30:22 UTC 2015 - lnussel@suse.de + +- fix shared library matching (fix-shared-library-matching.diff) + ------------------------------------------------------------------- Fri Nov 13 13:31:45 UTC 2015 - lnussel@suse.de diff --git a/rpmlint.spec b/rpmlint.spec index 39308ec..d4ef4f6 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -105,6 +105,7 @@ Patch46: suse-sysv-init-checks.diff Patch47: check-for-self-provides.diff Patch48: add-check-for-tmpfiles-created-at-r.diff Patch49: remove-files-attr-not-set-check.diff +Patch50: fix-shared-library-matching.diff # PATCHLIST END # BuildArch must at the end. is a bug: https://bugzilla.suse.com/show_bug.cgi?id=926766 BuildArch: noarch