rpms/rpmlint/devel .cvsignore, 1.27, 1.28 rpmlint.config, 1.38, 1.39 rpmlint.spec, 1.70, 1.71 sources, 1.27, 1.28
Ville Skyttä
scop at fedoraproject.org
Mon Jan 25 22:20:11 UTC 2010
Author: scop
Update of /cvs/pkgs/rpms/rpmlint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8358
Modified Files:
.cvsignore rpmlint.config rpmlint.spec sources
Log Message:
* Mon Jan 25 2010 Ville Skyttä <ville.skytta at iki.fi> - 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.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore 2 Nov 2009 21:40:41 -0000 1.27
+++ .cvsignore 25 Jan 2010 22:20:10 -0000 1.28
@@ -1 +1 @@
-rpmlint-0.92.tar.bz2
+rpmlint-0.93.tar.bz2
Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.config,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- rpmlint.config 2 Nov 2009 21:40:42 -0000 1.38
+++ rpmlint.config 25 Jan 2010 22:20:10 -0000 1.39
@@ -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", (
"<lua>",
"/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-")
Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- rpmlint.spec 2 Nov 2009 21:40:42 -0000 1.70
+++ rpmlint.spec 25 Jan 2010 22:20:10 -0000 1.71
@@ -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 file
%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ä <ville.skytta at iki.fi> - 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ä <ville.skytta at iki.fi> - 0.92-1
- Update to 0.92; fixes #528535, and #531102 (partially).
- Python byte compile patch applied/superseded upstream.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources 2 Nov 2009 21:40:42 -0000 1.27
+++ sources 25 Jan 2010 22:20:10 -0000 1.28
@@ -1 +1 @@
-87b07adf3a93066546223a007af18169 rpmlint-0.92.tar.bz2
+dcc6149ee00b9c7fdabe487686f0ec3b rpmlint-0.93.tar.bz2
More information about the scm-commits
mailing list