rpms/rpmlint/EL-5 rpmlint.config,1.6,1.7 rpmlint.spec,1.30,1.31

[Todd M. Zullinger (tmz)]

Author: tmz

Update of /cvs/extras/rpms/rpmlint/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22242/EL-5

Modified Files:
	rpmlint.config rpmlint.spec 
Log Message:
Sync Fedora license list with Revision 0.55 (Wiki rev 92)


Index: rpmlint.config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/EL-5/rpmlint.config,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rpmlint.config	11 Sep 2007 19:22:26 -0000	1.6
+++ rpmlint.config	6 Oct 2007 18:30:35 -0000	1.7
@@ -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 Wiki revision 90 of that page.
+    # Last synced with Revision 0.55 (Wiki revision 92) of that page.
     'Adobe',
     'Affero GPL',
     'AFL',
@@ -65,6 +65,7 @@
     'gnuplot',
     'GPL+',
     'GPL+ or Artistic',
+    'GPLv2+ or Artistic',
     'GPLv2',
     'GPLv2 with exceptions',
     'GPLv2+',
@@ -104,6 +105,7 @@
     'Nokia',
     'OpenLDAP',
     'OpenPBS',
+    'OReilly',
     'OSL 1.0',
     'OSL 1.0+',
     'OSL 1.1',
@@ -155,6 +157,7 @@
     'Free Art',
     # Font licenses
     'Arphic',
+    'Baekmuk',
     'Bitstream Vera',
     'mplus',
     'OFL',


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/EL-5/rpmlint.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- rpmlint.spec	11 Sep 2007 19:22:26 -0000	1.30
+++ rpmlint.spec	6 Oct 2007 18:30:35 -0000	1.31
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Sat Oct 06 2007 Todd Zullinger <tmz at pobox.com>
+- Sync Fedora license list with Revision 0.55 (Wiki rev 92).
+
 * Tue Sep 11 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.81-2
 - Sync Fedora license list with Wiki rev 90.