rpms/rpmlint/devel rpmlint.config,1.22,1.23 rpmlint.spec,1.48,1.49

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/rpmlint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8869

Modified Files:
	rpmlint.config rpmlint.spec 
Log Message:
update licenses


Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.config,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- rpmlint.config	26 Jul 2008 17:09:14 -0000	1.22
+++ rpmlint.config	12 Sep 2008 17:00:21 -0000	1.23
@@ -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 "16:08, 18 July 2008" of that page.
+    # Last synced with revision "1.09, 12 Sep 2008" of that page.
     'Adobe',
     'ADSL',
     'AFL',
@@ -51,7 +51,10 @@
     'BSD',
     'BSD with advertising',
     'CeCILL',
+    'CeCILL-B',
+    'CeCILL-C',
     'CDDL',
+    'CNRI',
     'CPAL',
     'CPL',
     'Condor',
@@ -75,6 +78,7 @@
     'GPL+',
     'GPL+ or Artistic',
     'GPLv1',
+    'GPLv2 or Artistic',
     'GPLv2+ or Artistic',
     'GPLv2',
     'GPLv2 with exceptions',
@@ -98,6 +102,7 @@
     'LGPLv2',
     'LGPLv2 with exceptions',
     'LGPLv2+',
+    'LGPLv2+ or Artistic',
     'LGPLv2+ with exceptions',
     'LGPLv3',
     'LGPLv3 with exceptions',
@@ -136,8 +141,10 @@
     'OSL 3.0',
     'OSL 3.0+',
     'OpenSSL',
+    'OReilly',
     'Phorum',
     'PHP',
+    'psutils',
     'Public Domain',
     'Python',
     'Qhull',
@@ -152,6 +159,8 @@
     'SLIB',
     'SPL',
     'TCL',
+    'Teeworlds',
+    'TMate',
     'UCD',
     'VOSTROM',
     'Vim',
@@ -187,10 +196,12 @@
     'DSL',
     'EFML',
     'Free Art',
+    'GeoGratis',
     # Font licenses
     'Arphic',
     'Baekmuk',
     'Bitstream Vera',
+    'Hershey',
     'Liberation',
     'Lucida',
     'mplus',


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- rpmlint.spec	26 Jul 2008 19:04:08 -0000	1.48
+++ rpmlint.spec	12 Sep 2008 17:00:21 -0000	1.49
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        0.84
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.84-3
+- Sync Fedora license list with Wiki revision 1.09
+
 * Sat Jul 26 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.84-2
 - 0.84, fixes #355861, #456304.
 - Sync Fedora license list with Wiki revision "16:08, 18 July 2008".