From 3c127f52c0f536533256e7bce91d20ddfe25e7ba Mon Sep 17 00:00:00 2001 From: Manuel Wolfshant Date: Jun 12 2008 01:38:45 +0000 Subject: sync with rawhide --- diff --git a/.cvsignore b/.cvsignore index cedb225..75368d2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -rpmlint-0.81.tar.bz2 +rpmlint-0.83.tar.bz2 diff --git a/rpmlint-CHANGES.package.old b/rpmlint-CHANGES.package.old index e6807db..66e1128 100644 --- a/rpmlint-CHANGES.package.old +++ b/rpmlint-CHANGES.package.old @@ -1,3 +1,46 @@ +* 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 +- 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 +- Filter false positives for /etc/profile.d/* file modes. +- Ship *.pyc and *.pyo as usual. + +* 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. +- Disable MenuCheck by default, it's currently Mandriva specific. +- Use upstream default valid License tag list, fixes #191078. +- Use upstream default valid Group tag list (dynamically retrieved from + the GROUPS file shipped with rpm). +- Allow /usr/libexec, fixes #195992. + +* Tue Apr 11 2006 Ville Skyttä - 0.76-1 +- 0.76. + +* 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ä +- Accept zlib License (#185501). + +* 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 +- 0.75 + -devel Epoch version check patch from CVS. + +* 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 - Take file based dependencies into account in dangling symlink checks (completes the fix for #165839). diff --git a/rpmlint.config b/rpmlint.config index 4ab7a25..e707225 100644 --- a/rpmlint.config +++ b/rpmlint.config @@ -28,10 +28,13 @@ 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 0.55 (Wiki revision 92) of that page. + # Last synced with Revision 0.88 of that page. 'Adobe', - 'Affero GPL', + 'ADSL', 'AFL', + 'AGPLv1', + 'AGPLv3', + 'AMPAS BSD', 'ARL', 'ASL 1.0', 'ASL 1.0+', @@ -49,22 +52,26 @@ setOption("ValidLicenses", ( 'BSD with advertising', 'CeCILL', 'CDDL', + 'CPAL', 'CPL', 'Condor', 'Copyright only', 'Cryptix', 'Crystal Stacker', + 'DOC', 'EPL', 'eCos', 'EFL 2.0', 'EFL 2.0+', 'EU Datagrid', + 'Fair', 'FTL', 'Giftware', 'Glide', 'gnuplot', 'GPL+', 'GPL+ or Artistic', + 'GPLv1', 'GPLv2+ or Artistic', 'GPLv2', 'GPLv2 with exceptions', @@ -84,23 +91,30 @@ setOption("ValidLicenses", ( 'ISC', 'Jabber', 'JasPer', + 'LBNL BSD', 'LGPLv2', 'LGPLv2 with exceptions', 'LGPLv2+', + 'LGPLv2+ with exceptions', 'LGPLv3', + 'LGPLv3 with exceptions', 'LGPLv3+', + 'LGPLv3+ with exceptions', 'libtiff', 'LPL', 'LPPL', 'mecab-ipadic', 'MIT', + 'MIT with advertising', 'MPLv1.0', 'MPLv1.0+', 'MPLv1.1', 'MPLv1.1+', 'NCSA', + 'NetCDF', 'NGPL', 'NOSL', + 'Naumen', 'Netscape', 'Nokia', 'OpenLDAP', @@ -119,21 +133,26 @@ setOption("ValidLicenses", ( 'PHP', 'Public Domain', 'Python', + 'Qhull', 'QPL', + 'RiceBSD', 'RPSL', 'Ruby', + 'Sendmail', 'Sleepycat', 'SISSL', 'SLIB', 'SPL', 'TCL', 'UCD', + 'VOSTROM', 'Vim', 'VNLSL', 'VSL', 'W3C', 'WTFPL', - 'wxWindows', + 'wxWidgets', + 'Xerox', 'xinetd', 'Zend', 'ZPLv1.0', @@ -143,6 +162,7 @@ setOption("ValidLicenses", ( 'ZPLv2.1', 'ZPLv2.1+', 'zlib', + 'zlib with acknowledgement', # Documentation licenses 'CDL', 'FBSDDL', @@ -150,17 +170,23 @@ setOption("ValidLicenses", ( 'IEEE', 'OFSFDL', 'Open Publication', + 'Public Use', # Content licenses 'CC-BY', 'CC-BY-SA', + 'CC-BY-ND', 'DSL', + 'EFML', 'Free Art', # Font licenses 'Arphic', 'Baekmuk', 'Bitstream Vera', + 'Liberation', + 'Lucida', 'mplus', 'OFL', + 'STIX', 'Utopia', 'XANO', # Others diff --git a/rpmlint.spec b/rpmlint.spec index fc2efb1..afc2e75 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -1,5 +1,5 @@ Name: rpmlint -Version: 0.81 +Version: 0.83 Release: 1%{?dist} Summary: Tool for checking common errors in RPM packages @@ -11,7 +11,6 @@ Source1: %{name}.config Source2: %{name}-CHANGES.package.old Patch0: %{name}-0.78-distregex.patch Patch1: %{name}-0.77-compile.patch -Patch2: %{name}-0.81-fedoralicensing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -34,7 +33,6 @@ and source packages can be checked. %setup -q %patch0 %patch1 -%patch2 sed -i -e /MenuCheck/d Config.py install -pm 644 %{SOURCE2} CHANGES.package.old @@ -70,7 +68,26 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sat Oct 06 2007 Todd Zullinger +* 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. +- Sync Fedora license list with Revision 0.88. + +* 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 +- 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 @@ -101,46 +118,3 @@ rm -rf $RPM_BUILD_ROOT - 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 -- 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 -- Filter false positives for /etc/profile.d/* file modes. -- Ship *.pyc and *.pyo as usual. - -* 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. -- Disable MenuCheck by default, it's currently Mandriva specific. -- Use upstream default valid License tag list, fixes #191078. -- Use upstream default valid Group tag list (dynamically retrieved from - the GROUPS file shipped with rpm). -- Allow /usr/libexec, fixes #195992. - -* Tue Apr 11 2006 Ville Skyttä - 0.76-1 -- 0.76. - -* 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ä -- Accept zlib License (#185501). - -* 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 -- 0.75 + -devel Epoch version check patch from CVS. - -* 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. diff --git a/sources b/sources index 4819a7e..a4210a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f4b9bde98f270d196bb9f0364d376e8 rpmlint-0.81.tar.bz2 +674e6d64330811abcee4d2acdbbd00e2 rpmlint-0.83.tar.bz2