rpms/rpmlint/F-12 rpmlint-0.93-rpm-4.8.patch, NONE, 1.1 .cvsignore, 1.26, 1.27 rpmlint.config, 1.37, 1.38 rpmlint.spec, 1.69, 1.70 sources, 1.26, 1.27 rpmlint-0.87-compile.patch, 1.1, NONE
Ville Skyttä
scop at fedoraproject.org
Mon Jan 25 23:20:57 UTC 2010
Author: scop
Update of /cvs/pkgs/rpms/rpmlint/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15055
Modified Files:
.cvsignore rpmlint.config rpmlint.spec sources
Added Files:
rpmlint-0.93-rpm-4.8.patch
Removed Files:
rpmlint-0.87-compile.patch
Log Message:
* Tue Jan 26 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.93-2
- Apply upstream patch to fix spec file check with rpm >= 4.8.0.
* 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.
- Add <lua> to list of valid scriptlet shells.
- Sync Fedora license list with Wiki revision 1.53.
rpmlint-0.93-rpm-4.8.patch:
SpecCheck.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
--- NEW FILE rpmlint-0.93-rpm-4.8.patch ---
Index: SpecCheck.py
===================================================================
--- SpecCheck.py (revision 1719)
+++ SpecCheck.py (working copy)
@@ -526,7 +526,13 @@
# errors logged above already
pass
if spec_obj:
- for src in spec_obj.sources():
+ try:
+ # rpm < 4.8.0
+ sources = spec_obj.sources()
+ except TypeError:
+ # rpm >= 4.8.0
+ sources = spec_obj.sources
+ for src in sources:
(url, num, flags) = src
(scheme, netloc) = urlparse(url)[0:2]
if flags & 1: # rpmspec.h, rpm.org ticket #123
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-12/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore 13 Sep 2009 22:15:35 -0000 1.26
+++ .cvsignore 25 Jan 2010 23:20:55 -0000 1.27
@@ -1 +1 @@
-rpmlint-0.91.tar.bz2
+rpmlint-0.93.tar.bz2
Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-12/rpmlint.config,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- rpmlint.config 13 Sep 2009 22:15:36 -0000 1.37
+++ rpmlint.config 25 Jan 2010 23:20:56 -0000 1.38
@@ -5,20 +5,26 @@
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",
"/bin/bash",
"/sbin/ldconfig",
@@ -34,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.49, 15 August 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',
@@ -57,8 +64,10 @@ setOption("ValidLicenses", (
'BitTorrent',
'Boost',
'BSD',
+ 'BSD Protection',
'BSD with advertising',
'CATOSL',
+ 'CC0',
'CeCILL',
'CeCILL-B',
'CeCILL-C',
@@ -132,6 +141,7 @@ setOption("ValidLicenses", (
'MirOS',
'MIT',
'MIT with advertising',
+ 'mod_macro',
'Motosoto',
'MPLv1.0',
'MPLv1.0+',
@@ -171,6 +181,7 @@ setOption("ValidLicenses", (
'Python',
'Qhull',
'QPL',
+ 'Rdisc',
'RiceBSD',
'RPSL',
'Ruby',
@@ -186,6 +197,7 @@ setOption("ValidLicenses", (
'TCL',
'Teeworlds',
'TMate',
+ 'TOSL',
'TPL',
'UCD',
'VOSTROM',
@@ -198,6 +210,7 @@ setOption("ValidLicenses", (
'wxWidgets',
'Xerox',
'xinetd',
+ 'XSkat',
'YPLv1.1',
'Zend',
'ZPLv1.0',
@@ -244,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', [])
@@ -275,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/F-12/rpmlint.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- rpmlint.spec 13 Sep 2009 22:15:36 -0000 1.69
+++ rpmlint.spec 25 Jan 2010 23:20:56 -0000 1.70
@@ -1,6 +1,6 @@
Name: rpmlint
-Version: 0.91
-Release: 1%{?dist}
+Version: 0.93
+Release: 2%{?dist}
Summary: Tool for checking common errors in RPM packages
Group: Development/Tools
@@ -10,8 +10,8 @@ Source0: http://rpmlint.zarb.org/
Source1: %{name}.config
Source2: %{name}-CHANGES.package.old
Source3: %{name}-etc.config
-# Fedora specific, not upstreamable
-Patch0: %{name}-0.87-compile.patch
+# Upstream post-0.93
+Patch0: %{name}-0.93-rpm-4.8.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -20,8 +20,13 @@ BuildRequires: rpm-python >= 4.4
BuildRequires: sed >= 3.95
Requires: rpm-python >= 4.4
Requires: python >= 2.4
-# python-magic is strictly speaking an optional dep, but it's quite desirable.
+%if ! 0%{?rhel}
+# python-magic and python-enchant are actually optional dependencies, but
+# 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
@@ -36,14 +41,15 @@ and source packages as well as spec file
%prep
%setup -q
-%patch0 -p1
+%patch0
sed -i -e /MenuCheck/d Config.py
+cp -p config config.example
install -pm 644 %{SOURCE2} CHANGES.package.old
install -pm 644 %{SOURCE3} config
%build
-make
+make COMPILE_PYC=1
%install
@@ -64,7 +70,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
@@ -75,6 +81,23 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jan 26 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.93-2
+- Apply upstream patch to fix spec file check with rpm >= 4.8.0.
+
+* 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.
+- Add <lua> to list of valid scriptlet shells.
+- Sync Fedora license list with Wiki revision 1.53.
+
* Mon Sep 14 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.91-1
- Update to 0.91; fixes #513811, #515185, #516492, #519694, and #521630.
- Add dependencies on gzip, bzip2, and xz.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-12/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources 13 Sep 2009 22:15:36 -0000 1.26
+++ sources 25 Jan 2010 23:20:56 -0000 1.27
@@ -1 +1 @@
-38b22629d28a02c0f6d675860dc6f6d7 rpmlint-0.91.tar.bz2
+dcc6149ee00b9c7fdabe487686f0ec3b rpmlint-0.93.tar.bz2
--- rpmlint-0.87-compile.patch DELETED ---
More information about the scm-commits
mailing list