From d8922694c409054aa167ed6c09abf54eccf6810e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sun, 5 Aug 2007 13:35:20 +0000
Subject: [PATCH] - Sync Fedora license list with Wiki.

---
 rpmlint.config | 19 +++++++++++++++++--
 rpmlint.spec   |  3 +++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/rpmlint.config b/rpmlint.config
index 87d09f1..4ec7b51 100644
--- a/rpmlint.config
+++ b/rpmlint.config
@@ -28,8 +28,8 @@ 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
-    'AFL',
     'Affero GPL',
+    'AFL',
     'ASL 1.0',
     'ASL 1.0+',
     'ASL 1.1',
@@ -38,29 +38,39 @@ setOption("ValidLicenses", (
     '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 @@ setOption("ValidLicenses", (
     'LGPLv2+',
     'LGPLv3',
     'LGPLv3+',
+    'libtiff',
     'LPL',
     'mecab-ipadic',
     'MIT',
@@ -84,6 +95,10 @@ setOption("ValidLicenses", (
     'OpenLDAP',
     'OSL 1.0',
     'OSL 1.0+',
+    'OSL 2.0',
+    'OSL 2.0+',
+    'OSL 3.0',
+    'OSL 3.0+',
     'OpenSSL',
     'Phorum',
     'PHP',
diff --git a/rpmlint.spec b/rpmlint.spec
index 3f34c7f..b39a025 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %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@redhat.com> - 0.80-2
 - new fedora licensing scheme