rpms/rpmlint/EL-4 rpmlint-0.77-compile.patch, NONE, 1.1 rpmlint-0.78-distregex.patch, NONE, 1.1 rpmlint.config, NONE, 1.1 .cvsignore, 1.8, 1.9 rpmlint.spec, 1.14, 1.15 sources, 1.8, 1.9 rpmlint-confmsg.patch, 1.1, NONE rpmlint-fedora-config, 1.7, NONE rpmlint-svcdefault.patch, 1.1, NONE
Thorsten Leemhuis (thl)
fedora-extras-commits at redhat.com
Sun Mar 4 08:19:20 UTC 2007
Author: thl
Update of /cvs/extras/rpms/rpmlint/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv823
Modified Files:
.cvsignore rpmlint.spec sources
Added Files:
rpmlint-0.77-compile.patch rpmlint-0.78-distregex.patch
rpmlint.config
Removed Files:
rpmlint-confmsg.patch rpmlint-fedora-config
rpmlint-svcdefault.patch
Log Message:
sync with FC-6 branch
rpmlint-0.77-compile.patch:
--- NEW FILE rpmlint-0.77-compile.patch ---
--- compile.py~ 2006-04-10 17:32:27.000000000 +0300
+++ compile.py 2006-09-16 16:48:16.000000000 +0300
@@ -12,6 +12,7 @@
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
--- Makefile~ 2006-06-29 00:19:16.000000000 +0300
+++ Makefile 2006-09-16 16:50:17.000000000 +0300
@@ -36,7 +36,7 @@
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*
if [ -z "$(POLICY)" ]; then \
sed -e 's/@VERSION@/$(VERSION)/' < rpmlint.py > $(DESTDIR)$(LIBDIR)/rpmlint.py ; \
rpmlint-0.78-distregex.patch:
--- NEW FILE rpmlint-0.78-distregex.patch ---
--- TagsCheck.py~ 2006-09-23 12:08:23.000000000 +0300
+++ TagsCheck.py 2006-09-24 00:19:26.000000000 +0300
@@ -384,6 +384,8 @@
basename_regex=re.compile('/?([^/]+)$')
changelog_version_regex=re.compile('[^>]([^ >]+)\s*$')
changelog_text_version_regex=re.compile('^\s*-\s*((\d+:)?[\w\.]+-[\w\.]+)')
+dist_regex=Config.getOption('DistRegex')
+if dist_regex: dist_regex=re.compile(dist_regex)
release_ext=Config.getOption('ReleaseExtension')
extension_regex=release_ext and re.compile(release_ext + '$')
use_version_in_changelog=Config.getOption('UseVersionInChangelog', 1)
@@ -598,11 +600,13 @@
srpm=pkg[rpm.RPMTAG_SOURCERPM]
# only check when source name correspond to name
if srpm[0:-8] == '%s-%s-%s' % (name, version, release):
- expected=version + '-' + release
+ expected=[version + '-' + release]
if epoch is not None: # regardless of use_epoch
- expected=str(epoch) + ':' + expected
- if expected != ret.group(1):
- printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected)
+ expected[0]=str(epoch) + ':' + expected[0]
+ if dist_regex:
+ expected.append(dist_regex.sub('', expected[0]))
+ if ret.group(1) not in expected:
+ printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected[0])
if clt: changelog=changelog + clt
if use_utf8 and not Pkg.is_utf8_str(' '.join(changelog)):
--- NEW FILE rpmlint.config ---
# -*- python -*-
# System wide rpmlint default configuration. Do not modify, override/add
# options in /etc/rpmlint/config and/or ~/.rpmlintrc as needed.
from Config import *
setOption("DistRegex", '\.(fc|rhe?l|el)\d+(?=\.|$)')
setOption("UseVersionInChangeLog", 1)
setOption("UseBzip2", 0)
setOption("UseDefaultRunlevels", 0)
setOption("UseEpoch", 0)
setOption("UseUTF8", 1)
setOption("ValidSrcPerms", (0664, 0644, ))
setOption("ValidShells", (
"/bin/sh",
"/bin/bash",
"/sbin/ldconfig",
"/usr/bin/perl",
"/usr/bin/python",
))
setOption("DanglingSymlinkExceptions", (
['consolehelper$', 'usermode'],
['consolehelper-gtk$', 'usermode-gtk'],
))
# Standard users & groups from the setup package:
setOption("StandardUsers",
("root", "bin", "daemon", "adm", "lp", "sync", "shutdown", "halt",
"mail", "news", "uucp", "operator", "games", "gopher", "ftp",
"nobody"))
setOption("StandardGroups",
("root", "bin", "daemon", "sys", "adm", "tty", "disk", "lp", "mem",
"kmem", "wheel", "mail", "news", "uucp", "man", "games", "gopher",
"dip", "ftp", "lock", "nobody", "users"))
# Output filters
addFilter("source-or-patch-not-[bg]zipped")
addFilter("%mklibname")
addFilter("no-dependency-on (perl|python)-base")
addFilter("no-dependency-on locales-")
addFilter("(python|perl5)-naming-policy-not-applied")
addFilter("no-(packager-tag|signature)")
addFilter("incoherent-version-in-name")
addFilter("invalid-build-requires")
addFilter("ghost-files-without-postin")
addFilter("postin-without-ghost-file-creation")
addFilter("no-major-in-name")
addFilter("no-provides")
addFilter("executable-in-library-package")
addFilter("non-versioned-file-in-library-package")
addFilter("requires-on-release")
addFilter("jar-not-indexed")
addFilter("invalid-(lc-messages|locale-man)-dir")
addFilter("outside-libdir-files")
addFilter("-debuginfo no-documentation")
addFilter("-debuginfo [^ ]+ /usr/lib/debug/")
addFilter("non-standard-dir-in-usr libexec")
addFilter(" gpg-pubkey ")
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/EL-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 20 Jun 2005 18:02:31 -0000 1.8
+++ .cvsignore 4 Mar 2007 08:18:46 -0000 1.9
@@ -1 +1 @@
-rpmlint-0.70.tar.bz2
+rpmlint-0.79.tar.bz2
Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/EL-4/rpmlint.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rpmlint.spec 30 Nov 2006 15:44:37 -0000 1.14
+++ rpmlint.spec 4 Mar 2007 08:18:46 -0000 1.15
@@ -1,25 +1,26 @@
Name: rpmlint
-Version: 0.70
+Version: 0.79
Release: 1%{?dist}
-Epoch: 0
Summary: Tool for checking common errors in RPM packages
Group: Development/Tools
License: GPL
-URL: http://people.mandriva.com/~flepied/projects/rpmlint/
-Source0: http://people.mandriva.com/~flepied/projects/rpmlint/dist/%{name}-%{version}.tar.bz2
-Source1: %{name}-fedora-config
-Patch0: %{name}-svcdefault.patch
-Patch1: %{name}-confmsg.patch
+URL: http://rpmlint.zarb.org/
+Source0: http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2
+Source1: %{name}.config
+Patch0: %{name}-0.78-distregex.patch
+Patch1: %{name}-0.77-compile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: python >= 1.5.2
+BuildRequires: python >= 2.0
BuildRequires: rpm-python
BuildRequires: sed >= 3.95
Requires: rpm-python
-Requires: python >= 1.5.2
+Requires: python >= 2.0
Requires: cpio
+Requires: binutils
+Requires: desktop-file-utils
%description
rpmlint is a tool for checking common errors in RPM packages. Binary
@@ -30,11 +31,7 @@
%setup -q
%patch0
%patch1
-sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
- FilesCheck.py I18NCheck.py
-for f in AUTHORS ChangeLog ; do
- iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-done
+sed -i -e /MenuCheck/d Config.py
%build
@@ -43,48 +40,113 @@
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-install -Dpm 644 rpmlint.bash-completion \
- $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/rpmlint
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
-
-# Take care of files that may be generated later.
-touch $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config{c,o}
-echo '%ghost %{_sysconfdir}/rpmlint/config?' > %{name}-%{version}-files.list
-for f in `find $RPM_BUILD_ROOT%{_datadir}/rpmlint -type f -name "*.py"` ; do
- f=`echo "$f" | sed "s|^$RPM_BUILD_ROOT||"`
- echo "$f" >> %{name}-%{version}-files.list
- for t in c o ; do
- pref=
- if [ ! -e "$RPM_BUILD_ROOT$f$t" ] ; then
- touch "$RPM_BUILD_ROOT$f$t"
- pref='%ghost '
- fi
- echo "$pref$f$t" >> %{name}-%{version}-files.list
- done
-done
+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
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f %{name}-%{version}-files.list
+%files
%defattr(-,root,root,0755)
%doc AUTHORS COPYING ChangeLog README
-%{_bindir}/rpm*
-%dir %{_datadir}/rpmlint/
-%exclude %{_datadir}/rpmlint/check-install.py*
-%dir %{_sysconfdir}/rpmlint/
-%config(noreplace) %{_sysconfdir}/rpmlint/config
+%config(noreplace) %{_sysconfdir}/rpmlint/
%{_sysconfdir}/bash_completion.d/
+%{_bindir}/rpmdiff
+%{_bindir}/rpmlint
+%{_datadir}/rpmlint/
+%exclude %{_datadir}/rpmlint/rpmlint.py[co]
+%{_mandir}/man1/rpmlint.1*
%changelog
-* Thu Nov 30 2006 Dennis Gilmore <dennis at ausil.us> - 0.70-1
-- add disttag
+* Fri Feb 2 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.79-1
+- 0.79, fixes #211417, #212491, #214605, #218250, #219068, #220061, #221116,
+ #222585, and #226879.
+- Accept *.elX disttags in default config.
+
+* Sun Oct 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.78-2
+- Accumulated bugfixes since 0.78: #209876, #209889, #210110, 210261.
+- Filter messages about gpg-pubkeys for now.
+
+* Sun Sep 24 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.78-1
+- 0.78, fixes #198605, #198616, #198705, #198707, #200032, #206383.
+- /etc/profile.d/* filtering no longer needed.
+
+* Sat Sep 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.77-2
+- Filter false positives for /etc/profile.d/* file modes.
+- Ship *.pyc and *.pyo as usual.
+
+* Thu Jun 29 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.77-1
+- 0.77, fixes #194466, #195962, #196008, #196985.
+- Make "disttag" configurable using the DistRegex config file option.
+- Sync standard users and groups with the FC setup package.
+- Disable MenuCheck by default, it's currently Mandriva specific.
+- Use upstream default valid License tag list, fixes #191078.
+- Use upstream default valid Group tag list (dynamically retrieved from
+ the GROUPS file shipped with rpm).
+- Allow /usr/libexec, fixes #195992.
+
+* Tue Apr 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.76-1
+- 0.76.
+
+* Mon Mar 27 2006 Ville Skyttä <ville.skytta at iki.fi>
+- Don't pass -T to objdump for *.debug files (#185227).
+- lib64 library path fixes (#185228).
+
+* Wed Mar 15 2006 Ville Skyttä <ville.skytta at iki.fi>
+- Accept zlib License (#185501).
+
+* Tue Feb 28 2006 Ville Skyttä <ville.skytta at iki.fi>
+- Accept Ruby License (#183384) and SIL Open Font License (#176405).
+
+* Sat Feb 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.75-1
+- 0.75 + -devel Epoch version check patch from CVS.
+
+* Tue Jan 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.71-3
+- Sync with upstream CVS as of 2006-01-15, includes improved versions of
+ most of the earlier patches.
+- Add dependency on binutils.
+
+* Sun Nov 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.71-2
+- Take file based dependencies into account in dangling symlink checks
+ (completes the fix for #165839).
+- Skip some checks for binaries not understood by objdump (#165173).
+- Improve long descriptions of some script warnings.
+- Fix command output parsing in non-English locales.
+- Import Enrico's latest DocFilesCheck (with some local tweaks).
+- Use rm instead of %%exclude.
+
+* Wed Nov 16 2005 Ville Skyttä <ville.skytta at iki.fi>
+- Add DocFilesCheck from Enrico Scholz.
+
+* Sat Sep 3 2005 Ville Skyttä <ville.skytta at iki.fi>
+- Improve accuracy of doc, info and games path regexps.
+- Improve error message when invoked on non-rpm files.
+- Filter more Mandriva specific warnings.
+
+* Sat Aug 13 2005 Ville Skyttä <ville.skytta at iki.fi>
+- Add dangling symlink exceptions tuned for Fedora to default config
+ (partially fixes #165839).
+
+* Wed Aug 10 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.71-1
+- 0.71, confmsg patch and bits from initvars patch applied upstream.
+- Filter out Mandriva-specific errors about missing locales-* deps (#165457).
+- Patch to not warn about non-empty *.bs (in Perl packages).
+- Patch to clarify PreReq explanation, make it a warning instead of an error.
+- Patch to warn about use of BuildPreReq.
+
+* Thu Jul 7 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.70-4
+- Fix false "positives" from libtool archives confused as scripts,
+ non-executable scripts installed in docs, FE disttags, unsuccessfully
+ expanded shell variables and quotation in init scripts.
-* Mon Jun 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.70-1
+* Mon Jun 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.70-3
- 0.70, use sed instead of perl during build.
- Default configuration improvements: allow Development/Debug group (for
debuginfo packages), filter out errors/warnings about non-indexed jars,
@@ -94,10 +156,10 @@
- Patch to warn about services that default to enabled after "chkconfig add",
not the other way around.
-* Thu May 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.69-1.1
+* Thu May 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.69-3
- Filter out more not-that-useful messages in the default config.
-* Sat Apr 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.69-1
+* Sat Apr 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.69-2
- 0.69.
- Simplify bash-completion snippet installation, remove triggers.
- Default configuration improvements: filter messages about missing packager,
@@ -107,7 +169,7 @@
- Convert docs to UTF-8.
- Improve summary.
-* Sun Mar 13 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.68-1
+* Sun Mar 13 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.68-2
- 0.68, siteperl patch applied upstream.
- Fix "no-dependency-on" filtering in default config.
- Add LaTeX Project Public License to default config.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/EL-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 20 Jun 2005 18:02:32 -0000 1.8
+++ sources 4 Mar 2007 08:18:46 -0000 1.9
@@ -1 +1 @@
-0457f6d88c6b25fe3cb31503249a6909 rpmlint-0.70.tar.bz2
+50ebdf88ede4b1265e9a69b20e356f44 rpmlint-0.79.tar.bz2
--- rpmlint-confmsg.patch DELETED ---
--- rpmlint-fedora-config DELETED ---
--- rpmlint-svcdefault.patch DELETED ---
More information about the fedora-extras-commits
mailing list