From 0245201e41435236b19e0378966fa373ae3235ea3ff7331bbb0645b7d45c3246 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 29 Feb 2012 11:02:50 +0000 Subject: [PATCH 1/2] - ignore fixed dependencies on config() OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=100 --- LibraryPolicyCheck.py | 2 +- rpmlint.changes | 5 +++++ rpmlint.spec | 10 ++++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/LibraryPolicyCheck.py b/LibraryPolicyCheck.py index e5efe04..1c37242 100644 --- a/LibraryPolicyCheck.py +++ b/LibraryPolicyCheck.py @@ -408,7 +408,7 @@ class LibraryPolicyCheck(AbstractCheck.AbstractCheck): # Verify shared lib policy package doesn't have hard dependency on non-lib packages if std_lib_package: for dep in pkg.requires(): - if (dep[0][0:7] == 'rpmlib('): + if (dep[0].startswith('rpmlib(') or dep[0].startswith('config(')): continue if (dep[1] & (rpm.RPMSENSE_GREATER | rpm.RPMSENSE_EQUAL)) == rpm.RPMSENSE_EQUAL: printWarning(pkg, "shlib-fixed-dependency", Pkg.formatRequire(dep[0], dep[1], dep[2])) diff --git a/rpmlint.changes b/rpmlint.changes index 809acb1..a7dd528 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 29 12:02:40 CET 2012 - dmueller@suse.de + +- ignore fixed dependencies on config() + ------------------------------------------------------------------- Mon Feb 20 16:05:23 UTC 2012 - lnussel@suse.de diff --git a/rpmlint.spec b/rpmlint.spec index 3bfbce8..5bbbaff 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -57,10 +57,16 @@ Source26: CheckLogrotate.py Source100: syntax-validator.py Url: http://rpmlint.zarb.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: rpm-python, /usr/bin/readelf, file, findutils, cpio, bash +Requires: /usr/bin/readelf +Requires: bash +Requires: checkbashisms +Requires: cpio +Requires: dash Requires: desktop-file-utils +Requires: file +Requires: findutils Requires: python-magic -Requires: dash checkbashisms +Requires: rpm-python BuildArch: noarch Patch0: rpmlint-suse.diff Patch1: suse-checks.diff From 46033fbd9c1ed7a76624035bf8de16fb2f9304de59a2cef8bd8c3ab115845b6e Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Wed, 29 Feb 2012 13:51:55 +0000 Subject: [PATCH 2/2] - add udisks2 to dbus whitelist (bnc#742751) - add smb4k to dbus whitelist (bnc#749065) OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=101 --- config | 6 ++++++ rpmlint.changes | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/config b/config index 085cc38..bf79ddc 100644 --- a/config +++ b/config @@ -349,6 +349,9 @@ setOption("DBUSServices.WhiteList", ( # udisks "org.freedesktop.UDisks.service", "org.freedesktop.UDisks.conf", + # udisks2 (bnc#742751) + "org.freedesktop.UDisks2.service", + "org.freedesktop.UDisks2.conf", # scmon "com.novell.Pkcs11Monitor.conf", # systemd (bnc#641924) @@ -485,6 +488,9 @@ setOption("DBUSServices.WhiteList", ( "org.kde.kalarmrtcwake.service", # NetworkManager-openvpn (bnc#732915) "nm-openconnect-service.conf", + # smb4k (bnc#749065) + "de.berlios.smb4k.mounthelper.conf", + "de.berlios.smb4k.mounthelper.service", )) # Output filters diff --git a/rpmlint.changes b/rpmlint.changes index a7dd528..ccd5139 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 29 13:49:51 UTC 2012 - lnussel@suse.de + +- add udisks2 to dbus whitelist (bnc#742751) +- add smb4k to dbus whitelist (bnc#749065) + ------------------------------------------------------------------- Wed Feb 29 12:02:40 CET 2012 - dmueller@suse.de