rpms/rpmlint/devel rpmlint.config,1.20,1.21 rpmlint.spec,1.45,1.46

[Todd M. Zullinger (tmz)]

Author: tmz

Update of /cvs/extras/rpms/rpmlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24936

Modified Files:
	rpmlint.config rpmlint.spec 
Log Message:
Sync Fedora license list with Revision 0.88
Bump release



Index: rpmlint.config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.config,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rpmlint.config	21 May 2008 17:56:07 -0000	1.20
+++ rpmlint.config	29 May 2008 00:19:04 -0000	1.21
@@ -28,7 +28,7 @@
 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 @@
     'gnuplot',
     'GPL+',
     'GPL+ or Artistic',
+    'GPLv1',
     'GPLv2+ or Artistic',
     'GPLv2',
     'GPLv2 with exceptions',
@@ -132,7 +133,9 @@
     'PHP',
     'Public Domain',
     'Python',
+    'Qhull',
     'QPL',
+    'RiceBSD',
     'RPSL',
     'Ruby',
     'Sendmail',
@@ -167,6 +170,7 @@
     'IEEE',
     'OFSFDL',
     'Open Publication',
+    'Public Use',
     # Content licenses
     'CC-BY',
     'CC-BY-SA',


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- rpmlint.spec	27 May 2008 16:41:44 -0000	1.45
+++ rpmlint.spec	29 May 2008 00:19:04 -0000	1.46
@@ -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 @@
 - 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 <tmz at pobox.com> 
 - Sync Fedora license list with Revision 0.83 (Wiki rev 131).