- Sync Fedora license list with Wiki revision "16:08, 18 July 2008".
- Rediff patches.
This commit is contained in:
Ville Skyttä 2008-07-26 19:04:08 +00:00
parent 1f0d2b3dfa
commit 0cf0e41b64
2 changed files with 11 additions and 9 deletions

View File

@ -1,6 +1,7 @@
--- TagsCheck.py~ 2006-09-23 12:08:23.000000000 +0300
+++ TagsCheck.py 2006-09-24 00:19:26.000000000 +0300
@@ -384,6 +384,8 @@
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\.]+)')
@ -9,8 +10,8 @@
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]
@@ -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

View File

@ -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 @@ URL: http://rpmlint.zarb.org/
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 @@ and source packages can be checked.
%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 @@ rm -rf $RPM_BUILD_ROOT
%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.