rpms/rpmlint/F-9 rpmlint-0.84-distregex.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 rpmlint.config, 1.20, 1.21 rpmlint.spec, 1.44, 1.45 sources, 1.19, 1.20 rpmlint-0.78-distregex.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sat Jul 26 19:04:38 UTC 2008
Author: scop
Update of /cvs/pkgs/rpms/rpmlint/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9502/F-9
Modified Files:
.cvsignore rpmlint.config rpmlint.spec sources
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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-9/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 9 Jun 2008 17:39:46 -0000 1.19
+++ .cvsignore 26 Jul 2008 19:04:08 -0000 1.20
@@ -1 +1 @@
-rpmlint-0.83.tar.bz2
+rpmlint-0.84.tar.bz2
Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-9/rpmlint.config,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rpmlint.config 9 Jun 2008 17:39:46 -0000 1.20
+++ rpmlint.config 26 Jul 2008 19:04:08 -0000 1.21
@@ -28,7 +28,7 @@
setOption("ValidLicenses", (
# These are the short names for all of the Fedora approved licenses.
# The master list is kept here: http://fedoraproject.org/wiki/Licensing
- # Last synced with Revision 0.88 of that page.
+ # Last synced with revision "16:08, 18 July 2008" of that page.
'Adobe',
'ADSL',
'AFL',
@@ -56,17 +56,20 @@
'CPL',
'Condor',
'Copyright only',
- 'Cryptix',
'Crystal Stacker',
'DOC',
- 'EPL',
+ 'ECL 1.0',
+ 'ECL 2.0',
'eCos',
'EFL 2.0',
'EFL 2.0+',
+ 'EPL',
+ 'ERPL',
'EU Datagrid',
'Fair',
'FTL',
'Giftware',
+ 'GL2PS',
'Glide',
'gnuplot',
'GPL+',
@@ -101,11 +104,13 @@
'LGPLv3+',
'LGPLv3+ with exceptions',
'libtiff',
+ 'LLGPL',
'LPL',
'LPPL',
'mecab-ipadic',
'MIT',
'MIT with advertising',
+ 'Motosoto',
'MPLv1.0',
'MPLv1.0+',
'MPLv1.1',
@@ -126,6 +131,8 @@
'OSL 1.1+',
'OSL 2.0',
'OSL 2.0+',
+ 'OSL 2.1',
+ 'OSL 2.1+',
'OSL 3.0',
'OSL 3.0+',
'OpenSSL',
@@ -138,6 +145,7 @@
'RiceBSD',
'RPSL',
'Ruby',
+ 'SCRIP',
'Sendmail',
'Sleepycat',
'SISSL',
@@ -154,6 +162,7 @@
'wxWidgets',
'Xerox',
'xinetd',
+ 'YPLv1.1',
'Zend',
'ZPLv1.0',
'ZPLv1.0+',
Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-9/rpmlint.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- rpmlint.spec 9 Jun 2008 17:39:46 -0000 1.44
+++ rpmlint.spec 26 Jul 2008 19:04:08 -0000 1.45
@@ -1,6 +1,6 @@
Name: rpmlint
-Version: 0.83
-Release: 1%{?dist}
+Version: 0.84
+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,6 +68,11 @@
%changelog
+* 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.
- Fedora licensing patch applied upstream.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-9/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 9 Jun 2008 17:39:46 -0000 1.19
+++ sources 26 Jul 2008 19:04:08 -0000 1.20
@@ -1 +1 @@
-674e6d64330811abcee4d2acdbbd00e2 rpmlint-0.83.tar.bz2
+d7e2aab6135a44a845f677d27f2722bd rpmlint-0.84.tar.bz2
--- rpmlint-0.78-distregex.patch DELETED ---
More information about the fedora-extras-commits
mailing list