rpms/rpmlint/devel rpmlint.config,1.32,1.33 rpmlint.spec,1.61,1.62

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/rpmlint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8736

Modified Files:
	rpmlint.config rpmlint.spec 
Log Message:
Sync Fedora license list with Wiki revision 1.43.


Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.config,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- rpmlint.config	23 Mar 2009 18:02:38 -0000	1.32
+++ rpmlint.config	18 May 2009 19:40:22 -0000	1.33
@@ -28,7 +28,7 @@ setOption("DanglingSymlinkExceptions", (
 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 "1.38, 27 Feb 2009" of that page.
+    # Last synced with revision "1.43, 14 May 2009" of that page.
     'AAL',
     'Adobe',
     'ADSL',
@@ -47,6 +47,7 @@ setOption("ValidLicenses", (
     'APSL 2.0+',
     'Artistic 2.0',
     'Artistic clarified',
+    'Beerware',
     'BitTorrent',
     'Boost',
     'BSD',
@@ -104,6 +105,7 @@ setOption("ValidLicenses", (
     'ISC',
     'Jabber',
     'JasPer',
+    'JPython',
     'LBNL BSD',
     'LGPLv2',
     'LGPLv2 with exceptions',
@@ -116,6 +118,7 @@ setOption("ValidLicenses", (
     'LGPLv3+ with exceptions',
     'libtiff',
     'LLGPL',
+    'Logica',
     'LPL',
     'LPPL',
     'mecab-ipadic',
@@ -152,6 +155,7 @@ setOption("ValidLicenses", (
     'Phorum',
     'PHP',
     'PlainTeX',
+    'Plexus',
     'psutils',
     'Public Domain',
     'Python',
@@ -160,6 +164,7 @@ setOption("ValidLicenses", (
     'RiceBSD',
     'RPSL',
     'Ruby',
+    'Saxpath',
     'SCEA',
     'SCRIP',
     'Sendmail',


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- rpmlint.spec	23 Mar 2009 18:02:38 -0000	1.61
+++ rpmlint.spec	18 May 2009 19:40:22 -0000	1.62
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon May 18 2009 Ville Skyttä <ville.skytta at iki.fi>
+- Sync Fedora license list with Wiki revision 1.43.
+
 * Mon Mar 23 2009 Ville Skyttä <ville.skytta at iki.fi>
 - Filter out dangling symlink warnings for /usr/share/doc/HTML/**/common in
   default config (#491188).