rpms/rpmlint/devel rpmlint-0.78-distregex.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 rpmlint.config, 1.2, 1.3 rpmlint.spec, 1.25, 1.26 sources, 1.13, 1.14 rpmlint-0.77-distregex.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/rpmlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10047/devel

Modified Files:
	.cvsignore rpmlint.config rpmlint.spec sources 
Added Files:
	rpmlint-0.78-distregex.patch 
Removed Files:
	rpmlint-0.77-distregex.patch 
Log Message:
* 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.


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)):


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	29 Jun 2006 20:29:40 -0000	1.13
+++ .cvsignore	23 Sep 2006 21:37:35 -0000	1.14
@@ -1 +1 @@
-rpmlint-0.77.tar.bz2
+rpmlint-0.78.tar.bz2


Index: rpmlint.config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rpmlint.config	16 Sep 2006 13:56:59 -0000	1.2
+++ rpmlint.config	23 Sep 2006 21:37:35 -0000	1.3
@@ -55,6 +55,3 @@
 addFilter("-debuginfo no-documentation")
 addFilter("-debuginfo [^ ]+ /usr/lib/debug/")
 addFilter("non-standard-dir-in-usr libexec")
-# Filter false /etc/profile.d positives until fixed upstream (#35714)
-addFilter("script-without-shellbang /etc/profile.d/")
-addFilter("non-executable-script /etc/profile.d/")


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- rpmlint.spec	16 Sep 2006 13:56:59 -0000	1.25
+++ rpmlint.spec	23 Sep 2006 21:37:35 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           rpmlint
-Version:        0.77
-Release:        2%{?dist}
+Version:        0.78
+Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -8,18 +8,19 @@
 URL:            http://rpmlint.zarb.org/
 Source0:        http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2
 Source1:        %{name}.config
-Patch0:         %{name}-0.77-distregex.patch
+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
@@ -64,6 +65,10 @@
 
 
 %changelog
+* 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.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	29 Jun 2006 20:29:40 -0000	1.13
+++ sources	23 Sep 2006 21:37:35 -0000	1.14
@@ -1 +1 @@
-72d3b3106212735d6bd597668f02f93c  rpmlint-0.77.tar.bz2
+73fd414976c4654c3007a55a762c7eed  rpmlint-0.78.tar.bz2


--- rpmlint-0.77-distregex.patch DELETED ---