[rpmlint/f20] add systemd to UsrLibBinaryException

Tom Callaway spot at fedoraproject.org
Wed Jun 25 16:53:20 UTC 2014


commit a2b8d8d6c43f57cba49f30ba6e98d31d9ebe20a0
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Wed Jun 25 12:53:18 2014 -0400

    add systemd to UsrLibBinaryException

 rpmlint-1.5-python-3.4-magic-number-fix.patch |   12 ++++++++++++
 rpmlint.config                                |    3 +++
 rpmlint.spec                                  |   14 +++++++++++++-
 3 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/rpmlint-1.5-python-3.4-magic-number-fix.patch b/rpmlint-1.5-python-3.4-magic-number-fix.patch
new file mode 100644
index 0000000..3a0425f
--- /dev/null
+++ b/rpmlint-1.5-python-3.4-magic-number-fix.patch
@@ -0,0 +1,12 @@
+diff -up rpmlint-1.5/FilesCheck.py.py34 rpmlint-1.5/FilesCheck.py
+--- rpmlint-1.5/FilesCheck.py.py34	2014-05-29 14:22:53.063802675 -0400
++++ rpmlint-1.5/FilesCheck.py	2014-05-29 14:23:07.577696983 -0400
+@@ -308,7 +308,7 @@ _python_magic_values = {
+     '3.1': 3150,
+     '3.2': 3180,
+     '3.3': 3230,
+-    '3.4': 3260,
++    '3.4': 3310,
+     }
+ 
+ def get_expected_pyc_magic(path):
diff --git a/rpmlint.config b/rpmlint.config
index 120f20d..1ad7ab3 100644
--- a/rpmlint.config
+++ b/rpmlint.config
@@ -322,6 +322,9 @@ setOption("ValidLicenses", (
 
 setOption('SystemLibPaths', ('/lib', '/lib64', '/usr/lib', '/usr/lib64'))
 
+# Add systemd dir to ignored path for UsrLibBinaryException
+setOption('UsrLibBinaryException', '^/usr/lib/(perl|python|menu|pkgconfig|systemd|lib[^/]+\.(so|l?a)$)')
+
 # Get standard users and groups from the setup package's uidgid file
 setOption('StandardUsers', [])
 setOption('StandardGroups', [])
diff --git a/rpmlint.spec b/rpmlint.spec
index fb9ada0..1aad23e 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        1.5
-Release:        9%{?dist}
+Release:        12%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -22,6 +22,8 @@ Patch1:		rpmlint-1.5-dont-modify-sys-argv-0.patch
 Patch2:		rpmlint-1.5-fix-unbound-var.patch
 # https://sourceforge.net/p/rpmlint/code/ci/9844a91e281b2da647c599c3958ec34375d245a2
 Patch3:		rpmlint-1.5-fix-unicode-name-bug.patch
+# http://sourceforge.net/p/rpmlint/code/ci/0929683e2544813d65ef85ae49b52ccdc6662746
+Patch4:		rpmlint-1.5-python-3.4-magic-number-fix.patch
 
 BuildArch:      noarch
 BuildRequires:  python >= 2.4
@@ -61,6 +63,7 @@ and source packages as well as spec files can be checked.
 %patch1 -p1 -b .argv0
 %patch2 -p1 -b .fixunbound
 %patch3 -p1 -b .fixunicode
+%patch4 -p1 -b .py34
 sed -i -e /MenuCheck/d Config.py
 cp -p config config.example
 install -pm 644 %{SOURCE2} CHANGES.package.old
@@ -111,6 +114,15 @@ make check
 
 
 %changelog
+* Wed Jun 25 2014 Tom Callaway <spot at fedoraproject.org> - 1.5-12
+- add systemd to UsrLibBinaryException
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu May 29 2014 Tom Callaway <spot at fedoraproject.org> - 1.5-10
+- fix python 3.4 magic number (#1102846)
+
 * Mon May 12 2014 Tom Callaway <spot at fedoraproject.org> - 1.5-9
 - update config to ignore non-readable /etc/ovirt-engine/isouploader.conf
 


More information about the scm-commits mailing list