From ea6fa59a77686722d2423a5e799bf53ff87d768e Mon Sep 17 00:00:00 2001
From: Manuel Wolfshant <wolfy@fedoraproject.org>
Date: Oct 18 2008 02:38:14 +0000
Subject: - Sync Fedora license list with Wiki revision 1.09


---

diff --git a/rpmlint.config b/rpmlint.config
index e707225..01c4640 100644
--- a/rpmlint.config
+++ b/rpmlint.config
@@ -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 0.88 of that page.
+    # Last synced with revision "1.09, 12 Sep 2008" of that page.
     'Adobe',
     'ADSL',
     'AFL',
@@ -51,27 +51,34 @@ setOption("ValidLicenses", (
     'BSD',
     'BSD with advertising',
     'CeCILL',
+    'CeCILL-B',
+    'CeCILL-C',
     'CDDL',
+    'CNRI',
     'CPAL',
     'CPL',
     'Condor',
     'Copyright only',
-    'Cryptix',
     'Crystal Stacker',
     'DOC',
-    'EPL',
+    'ECL 1.0',
+    'ECL 2.0',
     'eCos',
     'EFL 2.0',
     'EFL 2.0+',
+    'EPL',
+    'ERPL',
     'EU Datagrid',
     'Fair',
     'FTL',
     'Giftware',
+    'GL2PS',
     'Glide',
     'gnuplot',
     'GPL+',
     'GPL+ or Artistic',
     'GPLv1',
+    'GPLv2 or Artistic',
     'GPLv2+ or Artistic',
     'GPLv2',
     'GPLv2 with exceptions',
@@ -95,17 +102,20 @@ setOption("ValidLicenses", (
     'LGPLv2',
     'LGPLv2 with exceptions',
     'LGPLv2+',
+    'LGPLv2+ or Artistic',
     'LGPLv2+ with exceptions',
     'LGPLv3',
     'LGPLv3 with exceptions',
     'LGPLv3+',
     'LGPLv3+ with exceptions',
     'libtiff',
+    'LLGPL',
     'LPL',
     'LPPL',
     'mecab-ipadic',
     'MIT',
     'MIT with advertising',
+    'Motosoto',
     'MPLv1.0',
     'MPLv1.0+',
     'MPLv1.1',
@@ -126,11 +136,15 @@ setOption("ValidLicenses", (
     'OSL 1.1+',
     'OSL 2.0',
     'OSL 2.0+',
+    'OSL 2.1',
+    'OSL 2.1+',
     'OSL 3.0',
     'OSL 3.0+',
     'OpenSSL',
+    'OReilly',
     'Phorum',
     'PHP',
+    'psutils',
     'Public Domain',
     'Python',
     'Qhull',
@@ -138,12 +152,15 @@ setOption("ValidLicenses", (
     'RiceBSD',
     'RPSL',
     'Ruby',
+    'SCRIP',
     'Sendmail',
     'Sleepycat',
     'SISSL',
     'SLIB',
     'SPL',
     'TCL',
+    'Teeworlds',
+    'TMate',
     'UCD',
     'VOSTROM',
     'Vim',
@@ -154,6 +171,7 @@ setOption("ValidLicenses", (
     'wxWidgets',
     'Xerox',
     'xinetd',
+    'YPLv1.1',
     'Zend',
     'ZPLv1.0',
     'ZPLv1.0+',
@@ -178,10 +196,12 @@ setOption("ValidLicenses", (
     'DSL',
     'EFML',
     'Free Art',
+    'GeoGratis',
     # Font licenses
     'Arphic',
     'Baekmuk',
     'Bitstream Vera',
+    'Hershey',
     'Liberation',
     'Lucida',
     'mplus',
diff --git a/rpmlint.spec b/rpmlint.spec
index bc082f1..1e317a1 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        0.84
-Release:        2%{?dist}.1
+Release:        3%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct  18 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.84-3
+- Sync Fedora license list with Wiki revision 1.09
+
 * Wed Sep 10 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.84-2.1
 - rebuild with proper changelog