rpms/rpmlint/devel 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 .cvsignore, 1.9, 1.10 rpmlint-fedora-config, 1.10, 1.11 rpmlint.spec, 1.18, 1.19 sources, 1.9, 1.10 DocFilesCheck.py, 1.1, NONE rpmlint-0.71-docfilescheck.patch, 1.1, NONE rpmlint-0.71-errmsg.patch, 1.1, NONE rpmlint-0.71-locale.patch, 1.1, NONE rpmlint-0.71-objdump.patch, 1.1, NONE rpmlint-0.71-paths.patch, 1.1, NONE rpmlint-0.71-scriptinfo.patch, 1.1, NONE rpmlint-0.71-symlinks.patch, 1.1, NONE 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
Tue Jan 17 20:33:55 UTC 2006
Author: scop
Update of /cvs/extras/rpms/rpmlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32213
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
Removed Files:
DocFilesCheck.py rpmlint-0.71-docfilescheck.patch
rpmlint-0.71-errmsg.patch rpmlint-0.71-locale.patch
rpmlint-0.71-objdump.patch rpmlint-0.71-paths.patch
rpmlint-0.71-scriptinfo.patch rpmlint-0.71-symlinks.patch
rpmlint-disttag.patch rpmlint-execs.patch
rpmlint-initvars.patch rpmlint-perl-bs.patch
rpmlint-prereq.patch rpmlint-svcdefault.patch
Log Message:
* 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.
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.''',
)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 11 Aug 2005 19:32:46 -0000 1.9
+++ .cvsignore 17 Jan 2006 20:33:54 -0000 1.10
@@ -1 +1,2 @@
rpmlint-0.71.tar.bz2
+rpmlint-0.71-cvs20060115.patch.bz2
Index: rpmlint-fedora-config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint-fedora-config,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rpmlint-fedora-config 20 Nov 2005 21:21:02 -0000 1.10
+++ rpmlint-fedora-config 17 Jan 2006 20:33:54 -0000 1.11
@@ -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",
Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rpmlint.spec 20 Nov 2005 21:21:02 -0000 1.18
+++ rpmlint.spec 17 Jan 2006 20:33:54 -0000 1.19
@@ -1,6 +1,6 @@
Name: rpmlint
Version: 0.71
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Tool for checking common errors in RPM packages
Group: Development/Tools
@@ -8,20 +8,11 @@
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
-Source2: DocFilesCheck.py
-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
-Patch6: %{name}-0.71-paths.patch
-Patch7: %{name}-0.71-errmsg.patch
-Patch8: %{name}-0.71-symlinks.patch
-Patch9: %{name}-0.71-docfilescheck.patch
-Patch10: %{name}-0.71-objdump.patch
-Patch11: %{name}-0.71-locale.patch
-Patch12: %{name}-0.71-scriptinfo.patch
+Patch0: %{name}-0.71-disttag.patch
+Patch1: %{name}-0.71-cvs20060115.patch.bz2
+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
@@ -31,6 +22,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
@@ -39,20 +31,11 @@
%prep
%setup -q
-install -pm 644 %{SOURCE2} .
-%patch0
%patch1
+%patch0
%patch2
%patch3
%patch4
-%patch5
-%patch6
-%patch7
-%patch8
-%patch9
-%patch10
-%patch11
-%patch12
sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
FilesCheck.py I18NCheck.py
for f in AUTHORS ChangeLog ; do
@@ -105,6 +88,11 @@
%changelog
+* 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).
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 11 Aug 2005 19:32:46 -0000 1.9
+++ sources 17 Jan 2006 20:33:54 -0000 1.10
@@ -1 +1,2 @@
9e7645ee79bfc75540c885f05dca0751 rpmlint-0.71.tar.bz2
+ed1fa7aaa6cbfcdf866b423adcd40cb2 rpmlint-0.71-cvs20060115.patch.bz2
--- DocFilesCheck.py DELETED ---
--- rpmlint-0.71-docfilescheck.patch DELETED ---
--- rpmlint-0.71-errmsg.patch DELETED ---
--- rpmlint-0.71-locale.patch DELETED ---
--- rpmlint-0.71-objdump.patch DELETED ---
--- rpmlint-0.71-paths.patch DELETED ---
--- rpmlint-0.71-scriptinfo.patch DELETED ---
--- rpmlint-0.71-symlinks.patch DELETED ---
--- 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 fedora-extras-commits
mailing list