diff --git a/BrandingPolicyCheck.py b/BrandingPolicyCheck.py index 0fe240e..d361a3c 100644 --- a/BrandingPolicyCheck.py +++ b/BrandingPolicyCheck.py @@ -17,8 +17,6 @@ import os import string import Pkg -from BinariesCheck import BinaryInfo - class BrandingPolicyCheck(AbstractCheck.AbstractCheck): def __init__(self): self.map = [] @@ -29,7 +27,7 @@ class BrandingPolicyCheck(AbstractCheck.AbstractCheck): return pkg_requires = set(map(lambda x: string.split(x[0],'(')[0], pkg.requires())) - pkg_conflicts = set(map(lambda x: string.split(x[0],'(')[0], pkg.conflicts())) + pkg_conflicts = set(map(lambda x: x[0], pkg.conflicts())) # verify that only generic branding is required by non-branding packages for r in pkg.requires(): @@ -89,7 +87,7 @@ class BrandingPolicyCheck(AbstractCheck.AbstractCheck): conflict_prop = "otherproviders(%s)" % (generic_branding) have_conflict_prop = False for c in pkg_conflicts: - if c[0] == conflict_prop: + if c == conflict_prop: have_conflict_prop = True break diff --git a/CheckKDE4Deps.py b/CheckKDE4Deps.py index 8e99be2..e1aac6d 100644 --- a/CheckKDE4Deps.py +++ b/CheckKDE4Deps.py @@ -108,6 +108,12 @@ class KDE4Check(AbstractCheck.AbstractCheck): check=KDE4Check() -#if Config.info: -# addDetails( -#) +if Config.info: + addDetails('suse-kde4-missing-runtime-dependency', +"""Please add %kde4_runtime_requires to the (sub-)package to have the right versioned +dependency on the KDE version it was built against.""", +'suse-kde4-missing-dependency', +"""The package builds against a KDE4 related library, but it is missing the runtime +depencency macro. please add the suggested macro to the (sub-)package listing in +the spec file.""" +) diff --git a/KMPPolicyCheck.py b/KMPPolicyCheck.py index 602d6d0..22db3b0 100644 --- a/KMPPolicyCheck.py +++ b/KMPPolicyCheck.py @@ -17,8 +17,6 @@ import os import string import Pkg -from BinariesCheck import BinaryInfo - class KMPPolicyCheck(AbstractCheck.AbstractCheck): def __init__(self): self.map = [] diff --git a/LibraryPolicyCheck.py b/LibraryPolicyCheck.py index e17b171..e3fa29b 100644 --- a/LibraryPolicyCheck.py +++ b/LibraryPolicyCheck.py @@ -508,7 +508,7 @@ class LibraryPolicyCheck(AbstractCheck.AbstractCheck): filename = pkg.dirName() + '/' + f try: if stat.S_ISREG(files[f][0]): - bi = BinaryInfo(pkg, filename, f, 0) + bi = BinaryInfo(pkg, filename, f, False, True) libs_needed = libs_needed.union(bi.needed) if bi.soname != 0: lib_dir = string.join(f.split('/')[:-1], '/') diff --git a/rpmlint.changes b/rpmlint.changes index a46861c..b427c84 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Apr 5 00:10:20 CEST 2009 - dmueller@suse.de + +- fix library policy checker being inactive due to API change + ------------------------------------------------------------------- Fri Feb 27 17:05:41 CET 2009 - dmueller@suse.de diff --git a/rpmlint.spec b/rpmlint.spec index 4436102..e754bde 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -22,7 +22,7 @@ Name: rpmlint BuildRequires: rpm-python Summary: Rpm correctness checker Version: 0.85 -Release: 1 +Release: 2 Source0: %{name}-%{version}.tar.bz2 Source1: config Source1001: config.in @@ -222,6 +222,8 @@ rm -rf $RPM_BUILD_ROOT /usr/share/man/man1/rpmlint.1.gz %changelog +* Sun Apr 05 2009 dmueller@suse.de +- fix library policy checker being inactive due to API change * Fri Feb 27 2009 dmueller@suse.de - update to 0.85: * various new checks and fixes to existing checks @@ -260,7 +262,7 @@ rm -rf $RPM_BUILD_ROOT - update suse version check (add 11.1, drop 10.2) - check library packages more strict (bnc#456053) - ignore shared objects in a versioned non-std subdir (bnc#435588) -* Thu Nov 20 2008 dmueller@suse.de +* Fri Nov 21 2008 dmueller@suse.de - only test for regular files in ChkPkgConfig check * Fri Nov 07 2008 dmueller@suse.de - add check for otherproviders() in branding packages @@ -279,7 +281,7 @@ rm -rf $RPM_BUILD_ROOT * no significant changes * Wed Sep 03 2008 dmueller@suse.de - add description for useless-explicit-requires (bnc#405887) -* Wed Aug 20 2008 dmueller@suse.de +* Thu Aug 21 2008 dmueller@suse.de - rediff patch * Mon Aug 18 2008 schwab@suse.de - Fix name of completions file. @@ -302,7 +304,7 @@ rm -rf $RPM_BUILD_ROOT - also read /etc/rpmlint/factory.config * Fri Jun 27 2008 dmueller@suse.de - fix typo in suse-version check -* Sun Jun 22 2008 dmueller@suse.de +* Mon Jun 23 2008 dmueller@suse.de - update to 0.83: * removed upstreamed patches * a couple of new checks, bugfixes @@ -443,7 +445,7 @@ rm -rf $RPM_BUILD_ROOT - fix hardlink check for /bin * Sat Sep 01 2007 schwab@suse.de - Fix last change. -* Fri Aug 31 2007 dmueller@suse.de +* Sat Sep 01 2007 dmueller@suse.de - fix off-by-one in hardlink check * Fri Aug 31 2007 dmueller@suse.de - fix exception in DuplicatesCheck @@ -490,7 +492,7 @@ rm -rf $RPM_BUILD_ROOT - its also a devel package if it provides a -devel subpackage (#289735) * Wed Jul 04 2007 dmueller@suse.de - suppress %%config check for now (#286231) -* Tue Jun 26 2007 dmueller@suse.de +* Wed Jun 27 2007 dmueller@suse.de - fix typo in devel-rpmgroup check * Mon Jun 25 2007 dmueller@suse.de - another update list of legacy packages @@ -588,7 +590,7 @@ rm -rf $RPM_BUILD_ROOT - Suppress devel-file-in-non-devel-package for systemtap (#277338) - Make sure that the package fails if there is any syntax error anywhere -* Tue May 22 2007 dmueller@suse.de +* Wed May 23 2007 dmueller@suse.de - typo fix * Tue May 22 2007 dmueller@suse.de - update config @@ -617,7 +619,7 @@ rm -rf $RPM_BUILD_ROOT * Fri May 04 2007 dmueller@suse.de - remove check for usedforbuild tag. magic happens and it is created automatically -* Wed Apr 18 2007 dmueller@suse.de +* Thu Apr 19 2007 dmueller@suse.de - add spec checks for obsolete suse hacks * Wed Apr 18 2007 dmueller@suse.de - update to 0.80: