rpms/rpmlint/devel rpmlint-0.84-distregex.patch, NONE, 1.1 rpmlint.spec, 1.47, 1.48 rpmlint-0.78-distregex.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	rpmlint.spec 
Added Files:
	rpmlint-0.84-distregex.patch 
Removed Files:
	rpmlint-0.78-distregex.patch 
Log Message:
* Sat Jul 26 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.84-2
- 0.84, fixes #355861, #456304.
- Sync Fedora license list with Wiki revision "16:08, 18 July 2008".
- Rediff patches.


rpmlint-0.84-distregex.patch:

--- NEW FILE rpmlint-0.84-distregex.patch ---
diff -up rpmlint-0.84/TagsCheck.py.orig rpmlint-0.84/TagsCheck.py
--- rpmlint-0.84/TagsCheck.py.orig	2008-05-22 16:19:31.000000000 +0300
+++ rpmlint-0.84/TagsCheck.py	2008-07-26 21:54:06.000000000 +0300
@@ -398,6 +398,8 @@ packager_regex=re.compile(Config.getOpti
 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)
@@ -624,11 +626,13 @@ class TagsCheck(AbstractCheck.AbstractCh
                     srpm = pkg[rpm.RPMTAG_SOURCERPM] or ''
                     # 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: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- rpmlint.spec	26 Jul 2008 17:09:14 -0000	1.47
+++ rpmlint.spec	26 Jul 2008 19:04:08 -0000	1.48
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        0.84
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -9,7 +9,7 @@
 Source0:        http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2
 Source1:        %{name}.config
 Source2:        %{name}-CHANGES.package.old
-Patch0:         %{name}-0.78-distregex.patch
+Patch0:         %{name}-0.84-distregex.patch
 Patch1:         %{name}-0.77-compile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,7 +31,7 @@
 
 %prep
 %setup -q
-%patch0
+%patch0 -p1
 %patch1
 sed -i -e /MenuCheck/d Config.py
 install -pm 644 %{SOURCE2} CHANGES.package.old
@@ -68,9 +68,10 @@
 
 
 %changelog
-* Sat Jul 26 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.84-1
+* Sat Jul 26 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.84-2
 - 0.84, fixes #355861, #456304.
 - Sync Fedora license list with Wiki revision "16:08, 18 July 2008".
+- Rediff patches.
 
 * Tue May 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.83-1
 - 0.83, fixes #237204, #428096, #430206, #433783, #434694, #444441.


--- rpmlint-0.78-distregex.patch DELETED ---