diff --git a/rpmlint-1.3-svn1886-ghost-fix.patch b/rpmlint-1.3-svn1886-ghost-fix.patch new file mode 100644 index 0000000..e854fa9 --- /dev/null +++ b/rpmlint-1.3-svn1886-ghost-fix.patch @@ -0,0 +1,21 @@ +diff -up rpmlint-1.3/FilesCheck.py.ghostfix rpmlint-1.3/FilesCheck.py +--- rpmlint-1.3/FilesCheck.py.ghostfix 2011-10-12 14:46:28.290703772 -0400 ++++ rpmlint-1.3/FilesCheck.py 2011-10-12 14:46:35.254619020 -0400 +@@ -748,7 +748,7 @@ class FilesCheck(AbstractCheck.AbstractC + res = man_base_regex.search(f) + if res: + man_basenames.add(res.group(1)) +- if use_utf8: ++ if use_utf8 and chunk: + # TODO: better shell escaping or seq based invocation + cmd = commands.getstatusoutput( + 'env LC_ALL=C %s "%s" | gtbl | ' +@@ -807,7 +807,7 @@ class FilesCheck(AbstractCheck.AbstractC + fsf_wrong_address_regex.search(chunk): + printError(pkg, 'incorrect-fsf-address', f) + +- elif is_doc and compr_regex.search(f): ++ elif is_doc and chunk and compr_regex.search(f): + ff = compr_regex.sub('', f) + if not skipdocs_regex.search(ff): + # compressed docs, eg. info and man files etc diff --git a/rpmlint.config b/rpmlint.config index 7695688..75a450a 100644 --- a/rpmlint.config +++ b/rpmlint.config @@ -40,7 +40,7 @@ setOption("DanglingSymlinkExceptions", ( 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 "1.85, 21 October 2010" of that page. + # Last synced with revision "1.94, 20 September 2011" of that page. 'AAL', 'Abstyles', 'Adobe', @@ -64,12 +64,15 @@ setOption("ValidLicenses", ( 'ASL 2.0', 'ASL 2.0+', 'Barr', + 'Beerware', 'BeOpen', 'BitTorrent', 'Boost', + 'Borceux', 'BSD', 'BSD Protection', 'BSD with advertising', + 'BSD with attribution', 'CATOSL', 'CC0', 'CeCILL', @@ -85,12 +88,14 @@ setOption("ValidLicenses", ( 'Crystal Stacker', 'DOC', 'Dotseqn', + 'DSDP', 'dvipdfm', 'ECL 1.0', 'ECL 2.0', 'eCos', 'EFL 2.0', 'EFL 2.0+', + 'eGenix', 'Entessa', 'EPL', 'ERPL', @@ -102,6 +107,7 @@ setOption("ValidLicenses", ( 'Giftware', 'GL2PS', 'Glide', + 'Glulxe', 'gnuplot', 'GPL+', 'GPL+ or Artistic', @@ -212,6 +218,7 @@ setOption("ValidLicenses", ( 'Teeworlds', 'Threeparttable', 'TMate', + 'TORQUEv1.1', 'TOSL', 'TPL', 'UCD', diff --git a/rpmlint.spec b/rpmlint.spec index 8a8a490..8ec8dc8 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -1,6 +1,6 @@ Name: rpmlint Version: 1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -14,6 +14,9 @@ Source3: %{name}-etc.config Source4: %{name}.config.el4 # EL-5 specific config Source5: %{name}.config.el5 +# http://rpmlint.zarb.org/cgi-bin/trac.cgi/changeset/1886 +# https://bugzilla.redhat.com/show_bug.cgi?id=745446 +Patch0: rpmlint-1.3-svn1886-ghost-fix.patch BuildArch: noarch BuildRequires: python >= 2.4 BuildRequires: rpm-python >= 4.4 @@ -41,6 +44,7 @@ and source packages as well as spec files can be checked. %prep %setup -q +%patch0 -p1 -b .ghostfix sed -i -e /MenuCheck/d Config.py cp -p config config.example install -pm 644 %{SOURCE2} CHANGES.package.old @@ -81,6 +85,11 @@ make check %changelog +* Wed Oct 12 2011 Tom Callaway - 1.3-2 +- apply upstream fix for false error on checking ghosted man pages for + encoding (bz745446) +- update config to reflect new licenses (bz741298) + * Tue Jul 12 2011 Tom Callaway - 1.3-1 - update to 1.3