From ed7d0cfee24420a177bf63a06819c5f775fe4eb4 Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Aug 16 2007 15:37:38 +0000 Subject: - Sync Fedora license list with Wiki rev 68. - Move pre-2006 changelog entries to CHANGES.package.old. --- diff --git a/rpmlint-CHANGES.package.old b/rpmlint-CHANGES.package.old new file mode 100644 index 0000000..e6807db --- /dev/null +++ b/rpmlint-CHANGES.package.old @@ -0,0 +1,152 @@ +* 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). +- Improve long descriptions of some script warnings. +- Fix command output parsing in non-English locales. +- Import Enrico's latest DocFilesCheck (with some local tweaks). +- Use rm instead of %%exclude. + +* Wed Nov 16 2005 Ville Skyttä +- Add DocFilesCheck from Enrico Scholz. + +* 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ä +- Add dangling symlink exceptions tuned for Fedora to default config + (partially fixes #165839). + +* 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 +- 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 +- 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, + invalid LC_MESSAGES and man page dirs, and library packages containing + something else in addition to libraries. +- Make info about non-config files in /etc more accurate. +- 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 +- Filter out more not-that-useful messages in the default config. + +* 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, + Mandriva specific package naming conventions, %%ghost files without + %%post scriptlets, and 0664 source permissions. +- Exclude check-install.py, it doesn't currently work with rpm >= 4.2. +- Convert docs to UTF-8. +- Improve summary. + +* 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 +- 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 +- Update to 0.65. + +* 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 +- Requires cpio (bug 2169). + +* 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 +- Update to 0.60. + +* 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 +- Update to 0.57.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 +- Correctly %%ghost %%{_sysconfdir}/rpmlint/config? (bug 1251). + +* 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 +- Update to 0.55. +- Spec cleanups. + +* 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 +- 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 +- Update to 0.52. + +* 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 +- Upstream tarball reappeared, use it. + +* 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 +- 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 +- Update to 0.50, all patches now applied upstream. + +* 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 +- Update to 0.49. + +* 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 +- 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 +- 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 +- First Fedora release, based on upstream spec. diff --git a/rpmlint.config b/rpmlint.config index fa53e43..d9ab6e5 100644 --- a/rpmlint.config +++ b/rpmlint.config @@ -28,7 +28,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 Wiki revision 66 of that page. + # Last synced with Wiki revision 68 of that page. 'Affero GPL', 'AFL', 'ASL 1.0', @@ -49,6 +49,7 @@ setOption("ValidLicenses", ( 'CDDL', 'CPL', 'Condor', + 'Copyright only', 'Cryptix', 'Crystal Stacker', 'EPL', diff --git a/rpmlint.spec b/rpmlint.spec index b2a007f..ab0c717 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -1,6 +1,6 @@ Name: rpmlint Version: 0.80 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -8,6 +8,7 @@ License: GPLv2 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 Patch1: %{name}-0.77-compile.patch Patch2: %{name}-0.80-fedoralicensing.patch @@ -35,6 +36,7 @@ and source packages can be checked. %patch1 %patch2 sed -i -e /MenuCheck/d Config.py +install -pm 644 %{SOURCE2} CHANGES.package.old %build @@ -57,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,0755) -%doc AUTHORS COPYING ChangeLog README +%doc AUTHORS COPYING ChangeLog CHANGES.package.old README %config(noreplace) %{_sysconfdir}/rpmlint/ %{_sysconfdir}/bash_completion.d/ %{_bindir}/rpmdiff @@ -68,8 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Aug 15 2007 Ville Skyttä -- Sync Fedora license list with Wiki rev 66. +* 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 @@ -130,156 +133,3 @@ rm -rf $RPM_BUILD_ROOT - 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 -- 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). -- Improve long descriptions of some script warnings. -- Fix command output parsing in non-English locales. -- Import Enrico's latest DocFilesCheck (with some local tweaks). -- Use rm instead of %%exclude. - -* Wed Nov 16 2005 Ville Skyttä -- Add DocFilesCheck from Enrico Scholz. - -* 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ä -- Add dangling symlink exceptions tuned for Fedora to default config - (partially fixes #165839). - -* 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 -- 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 -- 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, - invalid LC_MESSAGES and man page dirs, and library packages containing - something else in addition to libraries. -- Make info about non-config files in /etc more accurate. -- 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 -- Filter out more not-that-useful messages in the default config. - -* 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, - Mandriva specific package naming conventions, %%ghost files without - %%post scriptlets, and 0664 source permissions. -- Exclude check-install.py, it doesn't currently work with rpm >= 4.2. -- Convert docs to UTF-8. -- Improve summary. - -* 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 -- 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 -- Update to 0.65. - -* 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 -- Requires cpio (bug 2169). - -* 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 -- Update to 0.60. - -* 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 -- Update to 0.57.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 -- Correctly %%ghost %%{_sysconfdir}/rpmlint/config? (bug 1251). - -* 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 -- Update to 0.55. -- Spec cleanups. - -* 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 -- 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 -- Update to 0.52. - -* 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 -- Upstream tarball reappeared, use it. - -* 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 -- 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 -- Update to 0.50, all patches now applied upstream. - -* 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 -- Update to 0.49. - -* 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 -- 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 -- 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 -- First Fedora release, based on upstream spec.