rpms/rpmlint/FC-4 rpmlint-0.71-disttag.patch, NONE, 1.1 rpmlint-0.71-doc-exec.patch, NONE, 1.1 rpmlint-0.71-la-exec.patch, NONE, 1.1 rpmlint-0.71-prereq.patch, NONE, 1.1 rpmlint-0.75-develdep.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 rpmlint-fedora-config, 1.8, 1.9 rpmlint.spec, 1.16, 1.17 sources, 1.9, 1.10 rpmlint-disttag.patch, 1.1, NONE rpmlint-execs.patch, 1.1, NONE rpmlint-initvars.patch, 1.2, NONE rpmlint-perl-bs.patch, 1.1, NONE rpmlint-prereq.patch, 1.1, NONE rpmlint-svcdefault.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sat Feb 18 13:17:20 UTC 2006
Author: scop
Update of /cvs/extras/rpms/rpmlint/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28439
Modified Files:
.cvsignore rpmlint-fedora-config rpmlint.spec sources
Added Files:
rpmlint-0.71-disttag.patch rpmlint-0.71-doc-exec.patch
rpmlint-0.71-la-exec.patch rpmlint-0.71-prereq.patch
rpmlint-0.75-develdep.patch
Removed Files:
rpmlint-disttag.patch rpmlint-execs.patch
rpmlint-initvars.patch rpmlint-perl-bs.patch
rpmlint-prereq.patch rpmlint-svcdefault.patch
Log Message:
* 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).
rpmlint-0.71-disttag.patch:
--- NEW FILE rpmlint-0.71-disttag.patch ---
--- TagsCheck.py~ 2006-01-15 23:33:42.000000000 +0200
+++ TagsCheck.py 2006-01-15 23:34:30.000000000 +0200
@@ -424,2 +424,3 @@
changelog_version_regex=re.compile('[^>]([^ >]+)\s*$')
+fedora_disttag_regex=re.compile('\.(fc|rhe?l)\d+$')
release_ext=Config.getOption('ReleaseExtension', 'mdk')
@@ -636,3 +637,3 @@
expected=str(epoch) + ':' + expected
- if expected != ret.group(1):
+ if ret.group(1) not in (expected, fedora_disttag_regex.sub('', expected)):
printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected)
rpmlint-0.71-doc-exec.patch:
--- NEW FILE rpmlint-0.71-doc-exec.patch ---
Index: FilesCheck.py
===================================================================
RCS file: /cooker/soft/rpmlint/FilesCheck.py,v
retrieving revision 1.96
diff -u -U1 -r1.96 FilesCheck.py
--- FilesCheck.py 15 Jan 2006 09:59:04 -0000 1.96
+++ FilesCheck.py 15 Jan 2006 21:08:24 -0000
@@ -565,3 +565,3 @@
- if mode & 0111 == 0:
+ if mode & 0111 == 0 and not doc_regex.search(f):
printError(pkg, 'non-executable-script', f, oct(perm))
rpmlint-0.71-la-exec.patch:
--- NEW FILE rpmlint-0.71-la-exec.patch ---
Index: FilesCheck.py
===================================================================
RCS file: /cooker/soft/rpmlint/FilesCheck.py,v
retrieving revision 1.96
diff -u -U1 -r1.96 FilesCheck.py
--- FilesCheck.py 15 Jan 2006 09:59:04 -0000 1.96
+++ FilesCheck.py 15 Jan 2006 21:08:59 -0000
@@ -189,2 +189,3 @@
script_regex=re.compile('^/((usr/)?s?bin|etc/(rc.d/init.d|profile.d|X11/xinit.d|cron.(hourly|daily|monthly|weekly)))/')
+libtool_archive_regex=re.compile('\.la$')
lib64python_regex=re.compile('^/usr/lib64/python')
@@ -562,3 +563,3 @@
printError(pkg, 'wrong-script-interpreter', f, '"' + res.group(1) + '"')
- else:
+ elif not (lib_path_regex.search(f) and libtool_archive_regex.search(f)):
printError(pkg, 'script-without-shellbang', f)
rpmlint-0.71-prereq.patch:
--- NEW FILE rpmlint-0.71-prereq.patch ---
Index: SpecCheck.py
===================================================================
RCS file: /cooker/soft/rpmlint/SpecCheck.py,v
retrieving revision 1.32
diff -u -r1.32 SpecCheck.py
--- SpecCheck.py 15 Jan 2006 09:59:04 -0000 1.32
+++ SpecCheck.py 15 Jan 2006 21:05:12 -0000
@@ -45,6 +45,7 @@
biarch_package_regex=re.compile(DEFAULT_BIARCH_PACKAGES)
hardcoded_lib_path_exceptions_regex=re.compile(Config.getOption('HardcodedLibPathExceptions', DEFAULT_HARDCODED_LIB_PATH_EXCEPTIONS))
prereq_regex=re.compile('^PreReq:\s*(.+?)\s*$', re.IGNORECASE)
+buildprereq_regex=re.compile('^BuildPreReq:\s*(.+?)\s*$', re.IGNORECASE)
use_utf8=Config.getOption('UseUTF8', Config.USEUTF8_DEFAULT)
# Only check for /lib, /usr/lib, /usr/X11R6/lib
@@ -190,7 +191,11 @@
res=prereq_regex.search(line)
if res:
- printError(pkg, 'prereq-use', res.group(1))
+ printWarning(pkg, 'prereq-use', res.group(1))
+
+ res=buildprereq_regex.search(line)
+ if res:
+ printWarning(pkg, 'buildprereq-use', res.group(1))
if not buildroot:
printError(pkg, 'no-buildroot-tag')
@@ -284,8 +289,13 @@
patch to be effective only on a given arch.''',
'prereq-use',
-'''The use of PreReq is deprecated. You should use Requires(pre), Requires(post),
-Requires(preun) or Requires(postun) according to your needs.''',
+'''The use of PreReq is deprecated. In the majority of cases, a plain Requires
+is enough and the right thing to do. Sometimes Requires(pre), Requires(post),
+Requires(preun) and/or Requires(postun) can also be used instead of PreReq.''',
+
+'buildprereq-use',
+'''The use of BuildPreReq is deprecated, build dependencies are always required
+before a package can be built. Use plain BuildRequires instead.''',
)
rpmlint-0.75-develdep.patch:
--- NEW FILE rpmlint-0.75-develdep.patch ---
--- TagsCheck.py 31 Jan 2006 10:49:33 -0000 1.90
+++ TagsCheck.py 17 Feb 2006 22:55:43 -0000 1.91
@@ -553,3 +553,3 @@
elif version:
- if use_epoch:
+ if epoch is not None: # regardless of use_epoch
expected=str(epoch) + ":" + version
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 11 Aug 2005 19:32:45 -0000 1.9
+++ .cvsignore 18 Feb 2006 13:17:19 -0000 1.10
@@ -1 +1 @@
-rpmlint-0.71.tar.bz2
+rpmlint-0.75.tar.bz2
Index: rpmlint-fedora-config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/rpmlint-fedora-config,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpmlint-fedora-config 11 Aug 2005 19:32:45 -0000 1.8
+++ rpmlint-fedora-config 18 Feb 2006 13:17:19 -0000 1.9
@@ -9,7 +9,9 @@
setOption("Packager", ".*")
setOption("UseVersionInChangeLog", 1)
setOption("UseBzip2", 0)
+setOption("UseDefaultRunlevels", 0)
setOption("UseEpoch", 0)
+setOption("UseUTF8", 1)
setOption("ValidSrcPerms", (0664, 0644, ))
setOption("ValidGroups", (
"Amusements/Games",
@@ -74,6 +76,10 @@
"/usr/bin/perl",
"/usr/bin/python",
))
+setOption("DanglingSymlinkExceptions", (
+ ['consolehelper$', 'usermode'],
+ ['consolehelper-gtk$', 'usermode-gtk'],
+))
# Output filters
addFilter("W: .* source-or-patch-not-[bg]zipped .*")
@@ -88,6 +94,7 @@
addFilter("W: .* ghost-files-without-postin")
addFilter("W: .* postin-without-ghost-file-creation .*")
addFilter("W: .* no-major-in-name .*")
+addFilter("W: .* no-provides .*")
addFilter("E: .* executable-in-library-package .*")
addFilter("E: .* non-versioned-file-in-library-package .*")
addFilter("E: .* requires-on-release .*")
Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/rpmlint.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rpmlint.spec 11 Aug 2005 19:32:45 -0000 1.16
+++ rpmlint.spec 18 Feb 2006 13:17:19 -0000 1.17
@@ -1,19 +1,19 @@
Name: rpmlint
-Version: 0.71
+Version: 0.75
Release: 1%{?dist}
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
+#Source0: http://people.mandriva.com/~flepied/projects/rpmlint/dist/%{name}-%{version}.tar.bz2
+Source0: http://www.zarb.org/~misc/%{name}-%{version}.tar.bz2
Source1: %{name}-fedora-config
-Patch0: %{name}-svcdefault.patch
-Patch1: %{name}-prereq.patch
-Patch2: %{name}-disttag.patch
-Patch3: %{name}-initvars.patch
-Patch4: %{name}-execs.patch
-Patch5: %{name}-perl-bs.patch
+Patch0: %{name}-0.71-disttag.patch
+Patch1: %{name}-0.75-develdep.patch
+Patch2: %{name}-0.71-prereq.patch
+Patch3: %{name}-0.71-la-exec.patch
+Patch4: %{name}-0.71-doc-exec.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -23,6 +23,7 @@
Requires: rpm-python
Requires: python >= 1.5.2
Requires: cpio
+Requires: binutils
%description
rpmlint is a tool for checking common errors in RPM packages. Binary
@@ -36,7 +37,6 @@
%patch2
%patch3
%patch4
-%patch5
sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
FilesCheck.py I18NCheck.py
for f in AUTHORS ChangeLog ; do
@@ -51,6 +51,7 @@
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT%{_datadir}/rpmlint/check-install.py*
install -Dpm 644 rpmlint.bash-completion \
$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/rpmlint
install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
@@ -79,15 +80,44 @@
%files -f %{name}-%{version}-files.list
%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
+%{_bindir}/rpmdiff
+%{_bindir}/rpmlint
+%dir %{_datadir}/rpmlint/
%{_sysconfdir}/bash_completion.d/
%changelog
+* 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).
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 11 Aug 2005 19:32:45 -0000 1.9
+++ sources 18 Feb 2006 13:17:19 -0000 1.10
@@ -1 +1 @@
-9e7645ee79bfc75540c885f05dca0751 rpmlint-0.71.tar.bz2
+22a7657bb976ee2b1df851bc3976f70a rpmlint-0.75.tar.bz2
--- rpmlint-disttag.patch DELETED ---
--- rpmlint-execs.patch DELETED ---
--- rpmlint-initvars.patch DELETED ---
--- rpmlint-perl-bs.patch DELETED ---
--- rpmlint-prereq.patch DELETED ---
--- rpmlint-svcdefault.patch DELETED ---
More information about the scm-commits
mailing list