rpms/rpmlint/devel rpmlint.config,1.19,1.20 rpmlint.spec,1.43,1.44

[Todd M. Zullinger (tmz)]

Author: tmz

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

Modified Files:
	rpmlint.config rpmlint.spec 
Log Message:
* Tue May 20 2008 Todd Zullinger <tmz at pobox.com> 
- Sync Fedora license list with Revision 0.83 (Wiki rev 131).



Index: rpmlint.config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.config,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rpmlint.config	3 Mar 2008 21:39:58 -0000	1.19
+++ rpmlint.config	21 May 2008 17:56:07 -0000	1.20
@@ -28,8 +28,9 @@
 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 0.69 (Wiki revision 110) of that page.
+    # Last synced with Revision 0.83 (Wiki revision 131) of that page.
     'Adobe',
+    'ADSL',
     'AFL',
     'AGPLv1',
     'AGPLv3',
@@ -51,16 +52,19 @@
     'BSD with advertising',
     'CeCILL',
     'CDDL',
+    'CPAL',
     'CPL',
     'Condor',
     'Copyright only',
     'Cryptix',
     'Crystal Stacker',
+    'DOC',
     'EPL',
     'eCos',
     'EFL 2.0',
     'EFL 2.0+',
     'EU Datagrid',
+    'Fair',
     'FTL',
     'Giftware',
     'Glide',
@@ -100,13 +104,16 @@
     'LPPL',
     'mecab-ipadic',
     'MIT',
+    'MIT with advertising',
     'MPLv1.0',
     'MPLv1.0+',
     'MPLv1.1',
     'MPLv1.1+',
     'NCSA',
+    'NetCDF',
     'NGPL',
     'NOSL',
+    'Naumen',
     'Netscape',
     'Nokia',
     'OpenLDAP',
@@ -128,18 +135,21 @@
     'QPL',
     'RPSL',
     'Ruby',
+    'Sendmail',
     'Sleepycat',
     'SISSL',
     'SLIB',
     'SPL',
     'TCL',
     'UCD',
+    'VOSTROM',
     'Vim',
     'VNLSL',
     'VSL',
     'W3C',
     'WTFPL',
-    'wxWindows',
+    'wxWidgets',
+    'Xerox',
     'xinetd',
     'Zend',
     'ZPLv1.0',
@@ -149,6 +159,7 @@
     'ZPLv2.1',
     'ZPLv2.1+',
     'zlib',
+    'zlib with acknowledgement',
     # Documentation licenses
     'CDL',
     'FBSDDL',
@@ -159,12 +170,16 @@
     # Content licenses
     'CC-BY',
     'CC-BY-SA',
+    'CC-BY-ND',
     'DSL',
+    'EFML',
     'Free Art',
     # Font licenses
     'Arphic',
     'Baekmuk',
     'Bitstream Vera',
+    'Liberation',
+    'Lucida',
     'mplus',
     'OFL',
     'STIX',


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- rpmlint.spec	3 Mar 2008 21:39:58 -0000	1.43
+++ rpmlint.spec	21 May 2008 17:56:07 -0000	1.44
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue May 20 2008 Todd Zullinger <tmz at pobox.com> 
+- Sync Fedora license list with Revision 0.83 (Wiki rev 131).
+
 * Mon Mar  3 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.82-3
 - Sync Fedora license list with Revision 0.69 (Wiki rev 110) (#434690).