rpms/rpmlint/devel rpmlint.config,1.8,1.9 rpmlint.spec,1.31,1.32

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	rpmlint.config rpmlint.spec 
Log Message:
* Sun Aug  5 2007 Ville Skyttä <ville.skytta at iki.fi>
- Sync Fedora license list with Wiki.



Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.config,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpmlint.config	2 Aug 2007 19:14:13 -0000	1.8
+++ rpmlint.config	5 Aug 2007 13:35:20 -0000	1.9
@@ -28,8 +28,8 @@
 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
-    'AFL',
     'Affero GPL',
+    'AFL',
     'ASL 1.0',
     'ASL 1.0+',
     'ASL 1.1',
@@ -38,29 +38,39 @@
     'ASL 2.0+',
     'APSL 2.0',
     'APSL 2.0+',
+    'Artistic 2.0',
     'Artistic clarified',
+    'BitTorrent',
     'Boost',
-    'BSD with advertising',
     'BSD',
+    'BSD with advertising',
     'CeCILL',
     'CDDL',
+    'CMU',
     'CPL',
     'Condor',
     'Cryptix',
+    'Crystal Stacker',
     'EPL',
     'eCos',
     'EFL 2.0',
     'EFL 2.0+',
     'EU Datagrid',
+    'Giftware',
+    'Glide',
     'GPL+',
+    'GPL+ or Artistic',
     'GPLv2',
+    'GPLv2 with exceptions',
     'GPLv2+',
     'GPLv3',
     'GPLv3+',
     'IBM',
+    'IJG',
     'iMatix',
     'Intel ACPI',
     'Interbase',
+    'ISC',
     'Jabber',
     'LaTeX',
     'LGPL+',
@@ -69,6 +79,7 @@
     'LGPLv2+',
     'LGPLv3',
     'LGPLv3+',
+    'libtiff',
     'LPL',
     'mecab-ipadic',
     'MIT',
@@ -84,6 +95,10 @@
     'OpenLDAP',
     'OSL 1.0',
     'OSL 1.0+',
+    'OSL 2.0',
+    'OSL 2.0+',
+    'OSL 3.0',
+    'OSL 3.0+',
     'OpenSSL',
     'Phorum',
     'PHP',


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- rpmlint.spec	2 Aug 2007 19:18:07 -0000	1.31
+++ rpmlint.spec	5 Aug 2007 13:35:20 -0000	1.32
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Sun Aug  5 2007 Ville Skyttä <ville.skytta at iki.fi>
+- Sync Fedora license list with Wiki.
+
 * Tue Jul 31 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 0.80-2
 - new fedora licensing scheme