diff --git a/.cvsignore b/.cvsignore index 1fc06ff..867ad0f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -rpmlint-0.92.tar.bz2 +rpmlint-0.93.tar.bz2 diff --git a/rpmlint.config b/rpmlint.config index 74f664a..3876a26 100644 --- a/rpmlint.config +++ b/rpmlint.config @@ -5,19 +5,24 @@ import os.path import re +import sys from Config import * import Pkg +setOption("CompressExtension", "gz") +setOption("DefaultPythonVersion", sys.version[:3]) +setOption("KernelModuleRPMsOK", False) setOption("MaxLineLength", 80) +setOption("NetworkEnabled", True) setOption("ReleaseExtension", '\.(fc|rhe?l|el)\d+(?=\.|$)') -setOption("UseVersionInChangeLog", True) -setOption("UseBzip2", False) setOption("UseDefaultRunlevels", False) setOption("UseEpoch", False) setOption("UseUTF8", True) +setOption("UseVersionInChangeLog", True) setOption("ValidSrcPerms", (0664, 0644, )) + setOption("ValidShells", ( "", "/bin/sh", @@ -35,13 +40,14 @@ setOption("DanglingSymlinkExceptions", ( setOption("ValidLicenses", ( # These are the short names for all of the Fedora approved licenses. # The master list is kept here: http://fedoraproject.org/wiki/Licensing - # Last synced with revision "1.53, 8 Oct 2009" of that page. + # Last synced with revision "1.64, 15 Jan 2010" of that page. 'AAL', 'Adobe', 'ADSL', 'AFL', 'AGPLv1', 'AGPLv3', + 'AMDPLPA', 'AMPAS BSD', 'ARL', 'ASL 1.0', @@ -58,8 +64,10 @@ setOption("ValidLicenses", ( 'BitTorrent', 'Boost', 'BSD', + 'BSD Protection', 'BSD with advertising', 'CATOSL', + 'CC0', 'CeCILL', 'CeCILL-B', 'CeCILL-C', @@ -173,6 +181,7 @@ setOption("ValidLicenses", ( 'Python', 'Qhull', 'QPL', + 'Rdisc', 'RiceBSD', 'RPSL', 'Ruby', @@ -188,6 +197,7 @@ setOption("ValidLicenses", ( 'TCL', 'Teeworlds', 'TMate', + 'TOSL', 'TPL', 'UCD', 'VOSTROM', @@ -200,6 +210,7 @@ setOption("ValidLicenses", ( 'wxWidgets', 'Xerox', 'xinetd', + 'XSkat', 'YPLv1.1', 'Zend', 'ZPLv1.0', @@ -246,6 +257,8 @@ setOption("ValidLicenses", ( 'Freely redistributable without restriction', )) +setOption('SystemLibPaths', ('/lib', '/lib64', '/usr/lib', '/usr/lib64')) + # Get standard users and groups from the setup package's uidgid file setOption('StandardUsers', []) setOption('StandardGroups', []) @@ -277,7 +290,7 @@ if setup_pkg: del setup_pkg # Output filters -addFilter("source-or-patch-not-[bg]zipped") +addFilter("source-or-patch-not-compressed") addFilter("%mklibname") addFilter("no-dependency-on (perl|python)-base") addFilter("no-dependency-on locales-") diff --git a/rpmlint.spec b/rpmlint.spec index c0ae9ae..3b3534e 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -1,5 +1,5 @@ Name: rpmlint -Version: 0.92 +Version: 0.93 Release: 1%{?dist} Summary: Tool for checking common errors in RPM packages @@ -18,10 +18,13 @@ BuildRequires: rpm-python >= 4.4 BuildRequires: sed >= 3.95 Requires: rpm-python >= 4.4 Requires: python >= 2.4 +%if ! 0%{?rhel} # python-magic and python-enchant are actually optional dependencies, but -# they bring quite desirable features. +# they bring quite desirable features. They're not available in RHEL/EPEL 5 +# as of 2010-01-25 though. Requires: python-magic Requires: python-enchant +%endif Requires: cpio Requires: binutils Requires: desktop-file-utils @@ -37,6 +40,7 @@ and source packages as well as spec files can be checked. %prep %setup -q sed -i -e /MenuCheck/d Config.py +cp -p config config.example install -pm 644 %{SOURCE2} CHANGES.package.old install -pm 644 %{SOURCE3} config @@ -63,7 +67,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,0755) -%doc AUTHORS COPYING ChangeLog CHANGES.package.old README +%doc AUTHORS COPYING ChangeLog CHANGES.package.old README config.example %config(noreplace) %{_sysconfdir}/rpmlint/ %{_sysconfdir}/bash_completion.d/ %{_bindir}/rpmdiff @@ -74,6 +78,14 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jan 25 2010 Ville Skyttä - 0.93-1 +- Update to 0.93; fixes #531102 and #555284. +- Enable checks requiring network access in default config. +- Disallow kernel module packages in default config. +- Remove old X11R6 dirs from paths treated as system ones in default config. +- Sync Fedora license list with Wiki revision 1.64. +- Omit python-enchant and python-magic dependencies when built on EL. + * Mon Nov 2 2009 Ville Skyttä - 0.92-1 - Update to 0.92; fixes #528535, and #531102 (partially). - Python byte compile patch applied/superseded upstream. diff --git a/sources b/sources index fb430c6..b964a8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -87b07adf3a93066546223a007af18169 rpmlint-0.92.tar.bz2 +dcc6149ee00b9c7fdabe487686f0ec3b rpmlint-0.93.tar.bz2