rpms/rpmlint/devel rpmlint.config,1.13,1.14 rpmlint.spec,1.36,1.37

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	rpmlint.config rpmlint.spec 
Log Message:
* Wed Aug 29 2007 Ville Skyttä <ville.skytta at iki.fi>
- Sync Fedora license list with Wiki rev 84 (Todd Zullinger).



Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.config,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rpmlint.config	16 Aug 2007 15:37:38 -0000	1.13
+++ rpmlint.config	29 Aug 2007 19:47:29 -0000	1.14
@@ -28,9 +28,11 @@
 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 68 of that page.
+    # Last synced with Wiki revision 84 of that page.
+    'Adobe',
     'Affero GPL',
     'AFL',
+    'ARL',
     'ASL 1.0',
     'ASL 1.0+',
     'ASL 1.1',
@@ -59,6 +61,7 @@
     'EU Datagrid',
     'Giftware',
     'Glide',
+    'gnuplot',
     'GPL+',
     'GPL+ or Artistic',
     'GPLv2',
@@ -68,6 +71,7 @@
     'GPLv3+',
     'IBM',
     'IJG',
+    'ImageMagick',
     'iMatix',
     'Intel ACPI',
     'Interbase',
@@ -96,6 +100,8 @@
     'OpenLDAP',
     'OSL 1.0',
     'OSL 1.0+',
+    'OSL 1.1',
+    'OSL 1.1+',
     'OSL 2.0',
     'OSL 2.0+',
     'OSL 3.0',
@@ -110,6 +116,7 @@
     'Ruby',
     'Sleepycat',
     'SISSL',
+    'SLIB',
     'SPL',
     'TCL',
     'UCD',
@@ -125,11 +132,15 @@
     'ZPLv1.0+',
     'ZPLv2.0',
     'ZPLv2.0+',
+    'ZPLv2.1',
+    'ZPLv2.1+',
     'zlib',
     # Documentation licenses
     'CDL',
     'FBSDDL',
     'GFDL',
+    'IEEE',
+    'OFSFDL',
     'Open Publication',
     # Content licenses
     'CC-BY',


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- rpmlint.spec	16 Aug 2007 15:37:38 -0000	1.36
+++ rpmlint.spec	29 Aug 2007 19:47:29 -0000	1.37
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Wed Aug 29 2007 Ville Skyttä <ville.skytta at iki.fi>
+- Sync Fedora license list with Wiki rev 84 (Todd Zullinger).
+
 * Thu Aug 16 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.80-3
 - Sync Fedora license list with Wiki rev 68.
 - Move pre-2006 changelog entries to CHANGES.package.old.