rpms/rpmlint/EL-5 rpmlint-0.85-compile.patch, NONE, 1.1 rpmlint-0.85-configs.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 rpmlint.spec, 1.39, 1.40 sources, 1.20, 1.21 rpmlint-0.78-distregex.patch, 1.1, NONE
Manuel Wolfshant
wolfy at fedoraproject.org
Sat Jan 24 21:56:24 UTC 2009
Author: wolfy
Update of /cvs/pkgs/rpms/rpmlint/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19138
Modified Files:
.cvsignore rpmlint.spec sources
Added Files:
rpmlint-0.85-compile.patch rpmlint-0.85-configs.patch
Removed Files:
rpmlint-0.78-distregex.patch
Log Message:
- Sync with Fedora rawhide version 0.85-3, including:
-- Update to upstream version 0.85
-- Apply upstream patch to load all *config from /etc/rpmlint.
- Sync Fedora license list as Wiki revision 1.34
- Filter out "filename-too-long-for-joliet" and "symlink-should-be-*"
warnings in default config.
rpmlint-0.85-compile.patch:
--- NEW FILE rpmlint-0.85-compile.patch ---
diff -up rpmlint-0.85/compile.py.orig rpmlint-0.85/compile.py
--- rpmlint-0.85/compile.py.orig 2006-04-01 11:09:19.000000000 +0300
+++ rpmlint-0.85/compile.py 2008-10-23 23:33:03.000000000 +0300
@@ -12,6 +12,7 @@ import py_compile
import sys
for f in sys.argv[2:]:
+ py_compile.compile(f, f + 'c', sys.argv[1] + f)
py_compile.compile(f, f + 'o', sys.argv[1] + f)
# compile.py ends here
diff -up rpmlint-0.85/Makefile.orig rpmlint-0.85/Makefile
--- rpmlint-0.85/Makefile.orig 2008-10-23 22:47:48.000000000 +0300
+++ rpmlint-0.85/Makefile 2008-10-23 23:33:03.000000000 +0300
@@ -36,7 +36,7 @@ clean:
install:
-mkdir -p $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(ETCDIR)/$(PACKAGE) $(DESTDIR)$(ETCDIR)/bash_completion.d $(DESTDIR)$(MANDIR)/man1
- cp -p *.py *.pyo $(DESTDIR)$(LIBDIR)
+ cp -p *.py *.pyc *.pyo $(DESTDIR)$(LIBDIR)
rm -f $(DESTDIR)$(LIBDIR)/compile.py*
sed -e 's/@VERSION@/$(VERSION)/' < rpmlint.py > $(DESTDIR)$(LIBDIR)/rpmlint.py
cp -p rpmlint rpmdiff $(DESTDIR)$(BINDIR)
rpmlint-0.85-configs.patch:
--- NEW FILE rpmlint-0.85-configs.patch ---
Index: rpmlint.py
===================================================================
--- rpmlint.py (revision 1466)
+++ rpmlint.py (revision 1467)
@@ -12,6 +12,7 @@
import AbstractCheck
import imp
import getopt
+import glob
import Pkg
import Config
import os
@@ -214,7 +215,10 @@
info_error=0
# load global config files
-for f in ('/usr/share/rpmlint/config','/etc/rpmlint/config'):
+configs = glob.glob('/etc/rpmlint/*config')
+configs.sort()
+configs.insert(0, '/usr/share/rpmlint/config')
+for f in configs:
try:
execfile(f)
except IOError:
Index: rpmlint.1
===================================================================
--- rpmlint.1 (revision 1466)
+++ rpmlint.1 (revision 1467)
@@ -55,7 +55,7 @@
\fB/usr/share/rpmlint/config\fR
Built-in configuration.
.TP
-\fB/etc/rpmlint/config\fR
+\fB/etc/rpmlint/*config\fR
System wide configuration.
.TP
\fB~/.rpmlintrc\fR
Index: README
===================================================================
--- README (revision 1466)
+++ README (revision 1467)
@@ -30,7 +30,7 @@
o Rpm file checks (RpmFileCheck).
If you want to change configuration options or the list of checks, use
-the global configuration file /etc/rpmlint/config or in the user
+the global configuration files /etc/rpmlint/*config or the user
configuration file ~/.rpmlintrc.
Configuration files are Python source files and should begin with the
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 26 Jul 2008 20:01:46 -0000 1.20
+++ .cvsignore 24 Jan 2009 21:55:53 -0000 1.21
@@ -1,2 +1 @@
-rpmlint-0.84.tar.bz2
-rpmlint-0.84-distregex.patch
+rpmlint-0.85.tar.bz2
Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/rpmlint.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- rpmlint.spec 18 Oct 2008 02:34:47 -0000 1.39
+++ rpmlint.spec 24 Jan 2009 21:55:54 -0000 1.40
@@ -1,6 +1,6 @@
Name: rpmlint
-Version: 0.84
-Release: 3%{?dist}
+Version: 0.85
+Release: 1%{?dist}
Summary: Tool for checking common errors in RPM packages
Group: Development/Tools
@@ -9,8 +9,11 @@
Source0: http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2
Source1: %{name}.config
Source2: %{name}-CHANGES.package.old
-Patch0: %{name}-0.84-distregex.patch
-Patch1: %{name}-0.77-compile.patch
+Source3: %{name}-etc.config
+# Fedora specific, not upstreamable
+Patch0: %{name}-0.85-compile.patch
+# From upstream svn
+Patch1: %{name}-0.85-configs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -32,9 +35,10 @@
%prep
%setup -q
%patch0 -p1
-%patch1
+%patch1 -p0
sed -i -e /MenuCheck/d Config.py
install -pm 644 %{SOURCE2} CHANGES.package.old
+install -pm 644 %{SOURCE3} config
%build
@@ -46,8 +50,6 @@
touch rpmlint.pyc rpmlint.pyo # just for the %%exclude to work everywhere
make install DESTDIR=$RPM_BUILD_ROOT ETCDIR=%{_sysconfdir} MANDIR=%{_mandir} \
LIBDIR=%{_datadir}/rpmlint BINDIR=%{_bindir}
-echo "# Add local system wide rpmlint configuration here." \
- > $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config
@@ -68,6 +70,14 @@
%changelog
+* Sat Jan 24 2009 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.85-1
+- Sync with Fedora rawhide version 0.85-3, including:
+-- Update to upstream version 0.85
+-- Apply upstream patch to load all *config from /etc/rpmlint.
+- Sync Fedora license list as Wiki revision 1.34
+- Filter out "filename-too-long-for-joliet" and "symlink-should-be-*"
+ warnings in default config.
+
* Sat Oct 18 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.84-3
- Sync Fedora license list with Wiki revision 1.09
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 26 Jul 2008 20:01:46 -0000 1.20
+++ sources 24 Jan 2009 21:55:54 -0000 1.21
@@ -1,2 +1 @@
-d7e2aab6135a44a845f677d27f2722bd rpmlint-0.84.tar.bz2
-4a6a0894e3f1a305464cb651b629af30 rpmlint-0.84-distregex.patch
+a9344017826f709328c63192c5a727ec rpmlint-0.85.tar.bz2
--- rpmlint-0.78-distregex.patch DELETED ---
More information about the fedora-extras-commits
mailing list