rpms/rpmlint/devel rpmlint.config,1.15,1.16 rpmlint.spec,1.39,1.40

[Todd M. Zullinger (tmz)]

Author: tmz

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

Modified Files:
	rpmlint.config rpmlint.spec 
Log Message:
* Fri Sep 28 2007 Todd Zullinger <tmz at pobox.com>
- Sync Fedora license list with Revision 0.55 (Wiki rev 92).



Index: rpmlint.config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.config,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rpmlint.config	3 Sep 2007 17:30:14 -0000	1.15
+++ rpmlint.config	28 Sep 2007 15:45:05 -0000	1.16
@@ -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 87 of that page.
+    # Last synced with Revision 0.55 (Wiki revision 92) of that page.
     'Adobe',
     'Affero GPL',
     'AFL',
@@ -59,20 +59,26 @@
     'EFL 2.0',
     'EFL 2.0+',
     'EU Datagrid',
+    'FTL',
     'Giftware',
     'Glide',
     'gnuplot',
     'GPL+',
     'GPL+ or Artistic',
+    'GPLv2+ or Artistic',
     'GPLv2',
     'GPLv2 with exceptions',
     'GPLv2+',
+    'GPLv2+ with exceptions',
     'GPLv3',
+    'GPLv3 with exceptions',
     'GPLv3+',
+    'GPLv3+ with exceptions',
     'IBM',
     'IJG',
     'ImageMagick',
     'iMatix',
+    'Imlib2',
     'Intel ACPI',
     'Interbase',
     'ISC',
@@ -99,6 +105,7 @@
     'Nokia',
     'OpenLDAP',
     'OpenPBS',
+    'OReilly',
     'OSL 1.0',
     'OSL 1.0+',
     'OSL 1.1',
@@ -150,6 +157,7 @@
     'Free Art',
     # Font licenses
     'Arphic',
+    'Baekmuk',
     'Bitstream Vera',
     'mplus',
     'OFL',


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- rpmlint.spec	3 Sep 2007 17:35:01 -0000	1.39
+++ rpmlint.spec	28 Sep 2007 15:45:05 -0000	1.40
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Fri Sep 28 2007 Todd Zullinger <tmz at pobox.com>
+- Sync Fedora license list with Revision 0.55 (Wiki rev 92).
+
 * Mon Sep  3 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.81-1
 - 0.81, fixes #239611, #240840, #241471, #244835.
 - Improve Fedora license check (Todd Zullinger).