diff --git a/rpmlint.config b/rpmlint.config index 3f186a5..e707225 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 Revision 0.83 (Wiki revision 131) of that page. + # Last synced with Revision 0.88 of that page. 'Adobe', 'ADSL', 'AFL', @@ -71,6 +71,7 @@ setOption("ValidLicenses", ( 'gnuplot', 'GPL+', 'GPL+ or Artistic', + 'GPLv1', 'GPLv2+ or Artistic', 'GPLv2', 'GPLv2 with exceptions', @@ -132,7 +133,9 @@ setOption("ValidLicenses", ( 'PHP', 'Public Domain', 'Python', + 'Qhull', 'QPL', + 'RiceBSD', 'RPSL', 'Ruby', 'Sendmail', @@ -167,6 +170,7 @@ setOption("ValidLicenses", ( 'IEEE', 'OFSFDL', 'Open Publication', + 'Public Use', # Content licenses 'CC-BY', 'CC-BY-SA', diff --git a/rpmlint.spec b/rpmlint.spec index e86ce69..afc2e75 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -1,6 +1,6 @@ Name: rpmlint Version: 0.83 -Release: 0.1%{?dist} +Release: 1%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -72,6 +72,7 @@ rm -rf $RPM_BUILD_ROOT - 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).