From 86620691102c39a56f043c27dafd9d275f65a52a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 13 Sep 2009 22:15:36 +0000 Subject: [PATCH] - Update to 0.91; fixes #513811, #515185, #516492, #519694, and #521630. - Add dependencies on gzip, bzip2, and xz. - Sync Fedora license list with Wiki revision 1.49. - Move pre-2008 %changelog entries to CHANGES.package.old. --- .cvsignore | 2 +- rpmlint-CHANGES.package.old | 131 +++++++++++++++++++++++------------- rpmlint.config | 6 +- rpmlint.spec | 77 +++++++-------------- sources | 2 +- 5 files changed, 118 insertions(+), 100 deletions(-) diff --git a/.cvsignore b/.cvsignore index f6dd164..15376af 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -rpmlint-0.90.tar.bz2 +rpmlint-0.91.tar.bz2 diff --git a/rpmlint-CHANGES.package.old b/rpmlint-CHANGES.package.old index 66e1128..19caf16 100644 --- a/rpmlint-CHANGES.package.old +++ b/rpmlint-CHANGES.package.old @@ -1,16 +1,55 @@ -* Sun Oct 15 2006 Ville Skyttä - 0.78-2 +* Thu Dec 6 2007 Ville Skyttä - 0.82-2 +- Remove leftover "Affero GPL" from last license list sync (Todd Zullinger). + +* Thu Dec 6 2007 Ville Skyttä - 0.82-1 +- 0.82, fixes #362441, #388881, #399871, #409941. +- Sync Fedora license list with Revision 0.61 (Wiki rev 98). + +* Fri Sep 28 2007 Todd Zullinger +- Sync Fedora license list with Revision 0.55 (Wiki rev 92). + +* Mon Sep 3 2007 Ville Skyttä - 0.81-1 +- 0.81, fixes #239611, #240840, #241471, #244835. +- Improve Fedora license check (Todd Zullinger). +- Sync Fedora license list with Wiki rev 87. + +* Wed Aug 29 2007 Ville Skyttä +- Sync Fedora license list with Wiki rev 84 (Todd Zullinger). + +* Thu Aug 16 2007 Ville Skyttä - 0.80-3 +- Sync Fedora license list with Wiki rev 68. +- Move pre-2006 changelog entries to CHANGES.package.old. + +* Tue Jul 31 2007 Tom "spot" Callaway - 0.80-2 +- new fedora licensing scheme + +* Thu May 31 2007 Ville Skyttä +- Filter hardcoded-library-path errors for /lib/udev. + +* Thu Apr 12 2007 Ville Skyttä - 0.80-1 +- 0.80, fixes #227389, #228645, #233795. +- Accept "Redistributable, no modification permitted" as a valid license. +- Filter messages about doc file dependencies on /bin/sh. +- Add missing dependency on file. + +* Fri Feb 2 2007 Ville Skyttä - 0.79-1 +- 0.79, fixes #211417, #212491, #214605, #218250, #219068, #220061, #221116, + #222585, and #226879. +- Accept *.elX disttags in default config. + +* Sun Oct 15 2006 Ville Skyttä - 0.78-2 - Accumulated bugfixes since 0.78: #209876, #209889, #210110, 210261. - Filter messages about gpg-pubkeys for now. -* Sun Sep 24 2006 Ville Skyttä - 0.78-1 +* Sun Sep 24 2006 Ville Skyttä - 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ä - 0.77-2 +* Sat Sep 16 2006 Ville Skyttä - 0.77-2 - Filter false positives for /etc/profile.d/* file modes. - Ship *.pyc and *.pyo as usual. -* Thu Jun 29 2006 Ville Skyttä - 0.77-1 +* Thu Jun 29 2006 Ville Skyttä - 0.77-1 - 0.77, fixes #194466, #195962, #196008, #196985. - Make "disttag" configurable using the DistRegex config file option. - Sync standard users and groups with the FC setup package. @@ -20,28 +59,28 @@ the GROUPS file shipped with rpm). - Allow /usr/libexec, fixes #195992. -* Tue Apr 11 2006 Ville Skyttä - 0.76-1 +* Tue Apr 11 2006 Ville Skyttä - 0.76-1 - 0.76. -* Mon Mar 27 2006 Ville Skyttä +* Mon Mar 27 2006 Ville Skyttä - Don't pass -T to objdump for *.debug files (#185227). - lib64 library path fixes (#185228). -* Wed Mar 15 2006 Ville Skyttä +* Wed Mar 15 2006 Ville Skyttä - Accept zlib License (#185501). -* Tue Feb 28 2006 Ville Skyttä +* Tue Feb 28 2006 Ville Skyttä - Accept Ruby License (#183384) and SIL Open Font License (#176405). -* Sat Feb 18 2006 Ville Skyttä - 0.75-1 +* Sat Feb 18 2006 Ville Skyttä - 0.75-1 - 0.75 + -devel Epoch version check patch from CVS. -* Tue Jan 17 2006 Ville Skyttä - 0.71-3 +* Tue Jan 17 2006 Ville Skyttä - 0.71-3 - Sync with upstream CVS as of 2006-01-15, includes improved versions of most of the earlier patches. - Add dependency on binutils. -* Sun Nov 20 2005 Ville Skyttä - 0.71-2 +* Sun Nov 20 2005 Ville Skyttä - 0.71-2 - Take file based dependencies into account in dangling symlink checks (completes the fix for #165839). - Skip some checks for binaries not understood by objdump (#165173). @@ -50,31 +89,31 @@ - Import Enrico's latest DocFilesCheck (with some local tweaks). - Use rm instead of %%exclude. -* Wed Nov 16 2005 Ville Skyttä +* Wed Nov 16 2005 Ville Skyttä - Add DocFilesCheck from Enrico Scholz. -* Sat Sep 3 2005 Ville Skyttä +* Sat Sep 3 2005 Ville Skyttä - Improve accuracy of doc, info and games path regexps. - Improve error message when invoked on non-rpm files. - Filter more Mandriva specific warnings. -* Sat Aug 13 2005 Ville Skyttä +* Sat Aug 13 2005 Ville Skyttä - Add dangling symlink exceptions tuned for Fedora to default config (partially fixes #165839). -* Wed Aug 10 2005 Ville Skyttä - 0.71-1 +* Wed Aug 10 2005 Ville Skyttä - 0.71-1 - 0.71, confmsg patch and bits from initvars patch applied upstream. - Filter out Mandriva-specific errors about missing locales-* deps (#165457). - Patch to not warn about non-empty *.bs (in Perl packages). - Patch to clarify PreReq explanation, make it a warning instead of an error. - Patch to warn about use of BuildPreReq. -* Thu Jul 7 2005 Ville Skyttä - 0.70-4 +* Thu Jul 7 2005 Ville Skyttä - 0.70-4 - Fix false "positives" from libtool archives confused as scripts, non-executable scripts installed in docs, FE disttags, unsuccessfully expanded shell variables and quotation in init scripts. -* Mon Jun 20 2005 Ville Skyttä - 0.70-3 +* Mon Jun 20 2005 Ville Skyttä - 0.70-3 - 0.70, use sed instead of perl during build. - Default configuration improvements: allow Development/Debug group (for debuginfo packages), filter out errors/warnings about non-indexed jars, @@ -84,10 +123,10 @@ - Patch to warn about services that default to enabled after "chkconfig add", not the other way around. -* Thu May 26 2005 Ville Skyttä - 0.69-3 +* Thu May 26 2005 Ville Skyttä - 0.69-3 - Filter out more not-that-useful messages in the default config. -* Sat Apr 16 2005 Ville Skyttä - 0.69-2 +* Sat Apr 16 2005 Ville Skyttä - 0.69-2 - 0.69. - Simplify bash-completion snippet installation, remove triggers. - Default configuration improvements: filter messages about missing packager, @@ -97,99 +136,99 @@ - Convert docs to UTF-8. - Improve summary. -* Sun Mar 13 2005 Ville Skyttä - 0.68-2 +* Sun Mar 13 2005 Ville Skyttä - 0.68-2 - 0.68, siteperl patch applied upstream. - Fix "no-dependency-on" filtering in default config. - Add LaTeX Project Public License to default config. - Remove upstream-only %%changelog entries. -* Sun Feb 13 2005 Ville Skyttä - 0:0.67-1 +* Sun Feb 13 2005 Ville Skyttä - 0:0.67-1 - 0.67. - Patch to catch more site_perl directories. - Default config improvements: filter Distribution and Vendor warnings, use empty string instead of None for release extension (fixes -i). -* Sat Jan 29 2005 Ville Skyttä - 0:0.65-1 +* Sat Jan 29 2005 Ville Skyttä - 0:0.65-1 - Update to 0.65. -* Sat Jan 1 2005 Ville Skyttä - 0:0.64-1 +* Sat Jan 1 2005 Ville Skyttä - 0:0.64-1 - Update to 0.64. - Default config tweaks: don't mandate Epochs nor "fdr" in Release. -* Tue Oct 19 2004 Ville Skyttä - 0:0.61-0.fdr.2 +* Tue Oct 19 2004 Ville Skyttä - 0:0.61-0.fdr.2 - Requires cpio (bug 2169). -* Sun Oct 3 2004 Ville Skyttä - 0:0.61-0.fdr.1 +* Sun Oct 3 2004 Ville Skyttä - 0:0.61-0.fdr.1 - Update to 0.61. -* Mon Aug 16 2004 Ville Skyttä - 0:0.60-0.fdr.1 +* Mon Aug 16 2004 Ville Skyttä - 0:0.60-0.fdr.1 - Update to 0.60. -* Mon May 3 2004 Ville Skyttä - 0:0.59-0.fdr.1 +* Mon May 3 2004 Ville Skyttä - 0:0.59-0.fdr.1 - Update to 0.59. -* Sun Feb 22 2004 Ville Skyttä - 0:0.57.1-0.fdr.1 +* Sun Feb 22 2004 Ville Skyttä - 0:0.57.1-0.fdr.1 - Update to 0.57.1. -* Wed Feb 11 2004 Ville Skyttä - 0:0.56-0.fdr.1 +* Wed Feb 11 2004 Ville Skyttä - 0:0.56-0.fdr.1 - Update to 0.56. -* Mon Feb 2 2004 Ville Skyttä - 0:0.55-0.fdr.3 +* Mon Feb 2 2004 Ville Skyttä - 0:0.55-0.fdr.3 - Correctly %%ghost %%{_sysconfdir}/rpmlint/config? (bug 1251). -* Sun Feb 1 2004 Ville Skyttä - 0:0.55-0.fdr.2 +* Sun Feb 1 2004 Ville Skyttä - 0:0.55-0.fdr.2 - Add back %%ghost handling of not-installed compiled versions of *.py. -* Fri Jan 30 2004 Ville Skyttä - 0:0.55-0.fdr.1 +* Fri Jan 30 2004 Ville Skyttä - 0:0.55-0.fdr.1 - Update to 0.55. - Spec cleanups. -* Tue Dec 23 2003 Ville Skyttä - 0:0.53-0.fdr.1 +* Tue Dec 23 2003 Ville Skyttä - 0:0.53-0.fdr.1 - Update to 0.53. -* Thu Oct 2 2003 Ville Skyttä - 0:0.52-0.fdr.2 +* Thu Oct 2 2003 Ville Skyttä - 0:0.52-0.fdr.2 - Add list of valid shells for post'n'friends scriptlets into default config. -* Sat Sep 13 2003 Ville Skyttä - 0:0.52-0.fdr.1 +* Sat Sep 13 2003 Ville Skyttä - 0:0.52-0.fdr.1 - Update to 0.52. -* Thu Sep 4 2003 Ville Skyttä - 0:0.51.1-0.fdr.4 +* Thu Sep 4 2003 Ville Skyttä - 0:0.51.1-0.fdr.4 - Filter more Mdk-specific warnings in default config. -* Wed Sep 3 2003 Ville Skyttä - 0:0.51.1-0.fdr.3 +* Wed Sep 3 2003 Ville Skyttä - 0:0.51.1-0.fdr.3 - Upstream tarball reappeared, use it. -* Sun Aug 24 2003 Ville Skyttä - 0:0.51.1-0.fdr.2 +* Sun Aug 24 2003 Ville Skyttä - 0:0.51.1-0.fdr.2 - Filter Mdk-specific python-related stuff in the default config. -* Fri Aug 15 2003 Ville Skyttä - 0:0.51.1-0.fdr.1 +* Fri Aug 15 2003 Ville Skyttä - 0:0.51.1-0.fdr.1 - Update to 0.51.1. - Own %%ghost'ed *.py{c,o}, and ditto for the config file. - Add list of valid licenses to default config. - Set "Fedora Linux" as suggested distribution in default config. - Clean up %%doc list. -* Fri May 9 2003 Ville Skyttä - 0:0.50-0.fdr.1 +* Fri May 9 2003 Ville Skyttä - 0:0.50-0.fdr.1 - Update to 0.50, all patches now applied upstream. -* Mon May 5 2003 Ville Skyttä - 0:0.49-0.fdr.2 +* Mon May 5 2003 Ville Skyttä - 0:0.49-0.fdr.2 - %%{buildroot} -> $RPM_BUILD_ROOT. - Filter out mdk-specific "no-dependancy perl-base" messages in config. -* Thu May 1 2003 Ville Skyttä - 0:0.49-0.fdr.1 +* Thu May 1 2003 Ville Skyttä - 0:0.49-0.fdr.1 - Update to 0.49. -* Sun Apr 20 2003 Ville Skyttä - 0:0.49-0.fdr.0.1.cvs20030420 +* Sun Apr 20 2003 Ville Skyttä - 0:0.49-0.fdr.0.1.cvs20030420 - Add one more strict Epoch checking patch. - Slightly enhanced default config. -* Fri Apr 11 2003 Ville Skyttä - 0:0.49-0.fdr.0.1.cvs20030411 +* Fri Apr 11 2003 Ville Skyttä - 0:0.49-0.fdr.0.1.cvs20030411 - Patch to work with installed packages (including -a) and rpm 4.2. - Remove spurious rpm-devel BuildRequirement. -* Tue Apr 8 2003 Ville Skyttä - 0:0.49-0.fdr.0.1.cvs20030408 +* Tue Apr 8 2003 Ville Skyttä - 0:0.49-0.fdr.0.1.cvs20030408 - Patch to work with packages signed with an unknown key. - Save .spec in UTF-8. -* Sun Mar 30 2003 Ville Skyttä - 0:0.49-0.fdr.0.1.cvs20030330 +* Sun Mar 30 2003 Ville Skyttä - 0:0.49-0.fdr.0.1.cvs20030330 - First Fedora release, based on upstream spec. diff --git a/rpmlint.config b/rpmlint.config index 063c3c4..636f7d8 100644 --- a/rpmlint.config +++ b/rpmlint.config @@ -10,6 +10,7 @@ from Config import * import Pkg +setOption("MaxLineLength", 80) setOption("ReleaseExtension", '\.(fc|rhe?l|el)\d+(?=\.|$)') setOption("UseVersionInChangeLog", True) setOption("UseBzip2", False) @@ -33,7 +34,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.44, 5 June 2009" of that page. + # Last synced with revision "1.49, 15 August 2009" of that page. 'AAL', 'Adobe', 'ADSL', @@ -128,6 +129,7 @@ setOption("ValidLicenses", ( 'LPL', 'LPPL', 'mecab-ipadic', + 'MirOS', 'MIT', 'MIT with advertising', 'Motosoto', @@ -135,12 +137,14 @@ setOption("ValidLicenses", ( 'MPLv1.0+', 'MPLv1.1', 'MPLv1.1+', + 'MS-PL', 'NCSA', 'NetCDF', 'NGPL', 'NOSL', 'Naumen', 'Netscape', + 'Newmat', 'Nokia', 'Noweb', 'OpenLDAP', diff --git a/rpmlint.spec b/rpmlint.spec index 8405ad2..c892122 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -1,6 +1,6 @@ Name: rpmlint -Version: 0.90 -Release: 2%{?dist} +Version: 0.91 +Release: 1%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -25,6 +25,9 @@ Requires: python-magic Requires: cpio Requires: binutils Requires: desktop-file-utils +Requires: gzip +Requires: bzip2 +Requires: xz %description rpmlint is a tool for checking common errors in RPM packages. Binary @@ -51,6 +54,10 @@ make install DESTDIR=$RPM_BUILD_ROOT ETCDIR=%{_sysconfdir} MANDIR=%{_mandir} \ install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config +%check +make check + + %clean rm -rf $RPM_BUILD_ROOT @@ -68,18 +75,25 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 14 2009 Ville Skyttä - 0.91-1 +- Update to 0.91; fixes #513811, #515185, #516492, #519694, and #521630. +- Add dependencies on gzip, bzip2, and xz. +- Sync Fedora license list with Wiki revision 1.49. +- Move pre-2008 %%changelog entries to CHANGES.package.old. + * Sun Jul 26 2009 Fedora Release Engineering - 0.90-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -* Mon Jun 29 2009 Ville Skyttä - 0.90-1 +* Mon Jun 29 2009 Ville Skyttä - 0.90-1 - 0.90; fixes #508683. -* Sun Jun 21 2009 Ville Skyttä - 0.89-1 -- Update to 0.89; fixes #461610, #496735, #496737 (partially), #491188, #506957. +* Sun Jun 21 2009 Ville Skyttä - 0.89-1 +- Update to 0.89; fixes #461610, #496735, #496737 (partially), #498107, + #491188, and #506957. - Sync Fedora license list with Wiki revision 1.44. - Parse list of standard users and groups from the setup package's uidgid file. -* Thu Mar 19 2009 Ville Skyttä - 0.87-1 +* Thu Mar 19 2009 Ville Skyttä - 0.87-1 - 0.87; fixes #480664, #483196, #483199, #486748, #488146, #488930, #489118. - Sync Fedora license list with Wiki revision 1.38. - Configs patch included upstream. @@ -87,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT * Wed Feb 25 2009 Fedora Release Engineering - 0.85-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Tue Jan 20 2009 Ville Skyttä +* Tue Jan 20 2009 Ville Skyttä - Sync Fedora license list with Wiki revision 1.34. - Filter out filename-too-long-for-joliet and symlink-should-be-* warnings in default config. @@ -95,10 +109,10 @@ rm -rf $RPM_BUILD_ROOT * Mon Dec 01 2008 Ignacio Vazquez-Abrams - 0.85-3 - Rebuild for Python 2.6 -* Thu Oct 30 2008 Ville Skyttä - 0.85-2 +* Thu Oct 30 2008 Ville Skyttä - 0.85-2 - Apply upstream patch to load all *config from /etc/rpmlint. -* Thu Oct 23 2008 Ville Skyttä - 0.85-1 +* Thu Oct 23 2008 Ville Skyttä - 0.85-1 - 0.85, fixes #355861, #450011, #455371, #456843, #461421, #461423, #461434. - Mute some explicit-lib-dependency false positives (#458290). - Sync Fedora license list with Wiki revision 1.19. @@ -107,12 +121,12 @@ rm -rf $RPM_BUILD_ROOT * Fri Sep 12 2008 Tom "spot" Callaway - 0.84-3 - Sync Fedora license list with Wiki revision 1.09 -* Sat Jul 26 2008 Ville Skyttä - 0.84-2 +* Sat Jul 26 2008 Ville Skyttä - 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ä - 0.83-1 +* Tue May 27 2008 Ville Skyttä - 0.83-1 - 0.83, fixes #237204, #428096, #430206, #433783, #434694, #444441. - Fedora licensing patch applied upstream. - Move pre-2007 changelog entries to CHANGES.package.old. @@ -121,44 +135,5 @@ rm -rf $RPM_BUILD_ROOT * Tue May 20 2008 Todd Zullinger - Sync Fedora license list with Revision 0.83 (Wiki rev 131). -* Mon Mar 3 2008 Ville Skyttä - 0.82-3 +* Mon Mar 3 2008 Ville Skyttä - 0.82-3 - Sync Fedora license list with Revision 0.69 (Wiki rev 110) (#434690). - -* Thu Dec 6 2007 Ville Skyttä - 0.82-2 -- Remove leftover "Affero GPL" from last license list sync (Todd Zullinger). - -* Thu Dec 6 2007 Ville Skyttä - 0.82-1 -- 0.82, fixes #362441, #388881, #399871, #409941. -- Sync Fedora license list with Revision 0.61 (Wiki rev 98). - -* Fri Sep 28 2007 Todd Zullinger -- Sync Fedora license list with Revision 0.55 (Wiki rev 92). - -* Mon Sep 3 2007 Ville Skyttä - 0.81-1 -- 0.81, fixes #239611, #240840, #241471, #244835. -- Improve Fedora license check (Todd Zullinger). -- Sync Fedora license list with Wiki rev 87. - -* Wed Aug 29 2007 Ville Skyttä -- Sync Fedora license list with Wiki rev 84 (Todd Zullinger). - -* Thu Aug 16 2007 Ville Skyttä - 0.80-3 -- Sync Fedora license list with Wiki rev 68. -- Move pre-2006 changelog entries to CHANGES.package.old. - -* Tue Jul 31 2007 Tom "spot" Callaway - 0.80-2 -- new fedora licensing scheme - -* Thu May 31 2007 Ville Skyttä -- Filter hardcoded-library-path errors for /lib/udev. - -* Thu Apr 12 2007 Ville Skyttä - 0.80-1 -- 0.80, fixes #227389, #228645, #233795. -- Accept "Redistributable, no modification permitted" as a valid license. -- Filter messages about doc file dependencies on /bin/sh. -- Add missing dependency on file. - -* Fri Feb 2 2007 Ville Skyttä - 0.79-1 -- 0.79, fixes #211417, #212491, #214605, #218250, #219068, #220061, #221116, - #222585, and #226879. -- Accept *.elX disttags in default config. diff --git a/sources b/sources index e38e74f..c3180fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5b2402a8072dfa6af5add80969230d4c rpmlint-0.90.tar.bz2 +38b22629d28a02c0f6d675860dc6f6d7 rpmlint-0.91.tar.bz2