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

KMPPolicyCheck.py

@@ -57,8 +57,9 @@ class KMPPolicyCheck(AbstractCheck.AbstractCheck):
             if s[0].startswith('modalias('):
                 have_modalias = True
                 continue
-            if s[0].startswith('packageand(-%s:' % (kernel_flavour)):
+            if s[0].startswith('packageand(%s:' % (kernel_flavour)):
                 have_proper_suppl = True
+                continue
 
             printWarning(pkg, 'suse-policy-kmp-excessive-supplements', s[0])
             have_only_modalias = False
@@ -73,16 +74,7 @@ if Config.info:
 'suse-policy-kmp-excessive-supplements',
 """ """,
 'suse-policy-kmp-missing-supplements',
-"""If your kmp modules match some specific hardware, i.e. if the
-"find-supplements" search done at the end of a build creates some
-modalias() dependencies, you don't need to do anything. If your
-module is hardware independent, you need to add the dependencies manually.
-
-To do this, add a preamble (-p) to your %suse_kernel_module_package
-macro. the file should look like this:
-
- Enhances: kernel-%1
- Supplements: packageand(kernel-%1:%{-n*})
-
+"""make sure that your buildrequires includes kernel-syms and module-init-tools
+for proper dependencies to be built.
 """,
 )

check-cron-dependency.diff

@@ -1,15 +1,16 @@
 --- FilesCheck.py
 +++ FilesCheck.py
-@@ -837,6 +837,8 @@ class FilesCheck(AbstractCheck.AbstractCheck):
+@@ -835,6 +835,9 @@
              logrotate_file=res or logrotate_file
              if res and res.group(1) != pkg.name:
                  printError(pkg, 'incoherent-logrotate-file', f)
-+            if (f.startswith('/etc/cron.') or res) and not ('cron' in pkg.requires()):
++            if (f.startswith('/etc/cron.') or res) \
++               and not ('cron' in pkg.requires()+pkg.recommends()+pkg.suggests()):
 +                printError(pkg, 'missing-dependency-to-cron', "for logrotate script", f)
              link=enreg[3]
              if link != '':
                  ext=compr_regex.search(link)
-@@ -1468,6 +1470,12 @@ packaged as arch dependent, or something else.  Verify what the case is, and
+@@ -1463,6 +1466,12 @@
  if there's no way to produce useful debuginfo out of it, disable creation of
  the debuginfo package.''',
  

rpmlint.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May  2 19:31:12 CEST 2008 - dmueller@suse.de
+
+- readd cron check
+- fix kmp check after the policy change
+
 -------------------------------------------------------------------
 Wed Apr 30 09:36:32 CEST 2008 - dmueller@suse.de
 

rpmlint.spec

@@ -15,7 +15,7 @@ Name:           rpmlint
 BuildRequires:  rpm-python
 Summary:        Rpm correctness checker
 Version:        0.82
-Release:        40
+Release:        42
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        config
 Source1001:     config.in
@@ -144,6 +144,7 @@ Authors:
 %patch38
 %patch39
 %patch41
+%patch42
 %patch46
 %patch47
 %patch48
@@ -157,8 +158,6 @@ Authors:
 %patch56
 %patch57
 %patch58
-# not yet, needs further support for recommends
-#%patch42
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
 cp -p %{SOURCE3} .
@@ -197,6 +196,9 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/man/man1/rpmlint.1.gz
 
 %changelog
+* Fri May 02 2008 dmueller@suse.de
+- readd cron check
+- fix kmp check after the policy change
 * Wed Apr 30 2008 dmueller@suse.de
 - add checker for correct deps of kde4 packages
 - add check for mono requirements (BNC#381979)