From ebc9da965bb0ecc2fc30f11459b05aaa53d6977e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Wed, 29 Aug 2007 19:47:29 +0000
Subject: [PATCH] - Sync Fedora license list with Wiki rev 84 (Todd Zullinger).

---
 rpmlint.config | 13 ++++++++++++-
 rpmlint.spec   |  3 +++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/rpmlint.config b/rpmlint.config
index d9ab6e5..2cae57f 100644
--- a/rpmlint.config
+++ b/rpmlint.config
@@ -28,9 +28,11 @@ 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 Wiki revision 68 of that page.
+    # Last synced with Wiki revision 84 of that page.
+    'Adobe',
     'Affero GPL',
     'AFL',
+    'ARL',
     'ASL 1.0',
     'ASL 1.0+',
     'ASL 1.1',
@@ -59,6 +61,7 @@ setOption("ValidLicenses", (
     'EU Datagrid',
     'Giftware',
     'Glide',
+    'gnuplot',
     'GPL+',
     'GPL+ or Artistic',
     'GPLv2',
@@ -68,6 +71,7 @@ setOption("ValidLicenses", (
     'GPLv3+',
     'IBM',
     'IJG',
+    'ImageMagick',
     'iMatix',
     'Intel ACPI',
     'Interbase',
@@ -96,6 +100,8 @@ setOption("ValidLicenses", (
     'OpenLDAP',
     'OSL 1.0',
     'OSL 1.0+',
+    'OSL 1.1',
+    'OSL 1.1+',
     'OSL 2.0',
     'OSL 2.0+',
     'OSL 3.0',
@@ -110,6 +116,7 @@ setOption("ValidLicenses", (
     'Ruby',
     'Sleepycat',
     'SISSL',
+    'SLIB',
     'SPL',
     'TCL',
     'UCD',
@@ -125,11 +132,15 @@ setOption("ValidLicenses", (
     'ZPLv1.0+',
     'ZPLv2.0',
     'ZPLv2.0+',
+    'ZPLv2.1',
+    'ZPLv2.1+',
     'zlib',
     # Documentation licenses
     'CDL',
     'FBSDDL',
     'GFDL',
+    'IEEE',
+    'OFSFDL',
     'Open Publication',
     # Content licenses
     'CC-BY',
diff --git a/rpmlint.spec b/rpmlint.spec
index ab0c717..197e7f0 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 29 2007 Ville Skyttä <ville.skytta at iki.fi>
+- Sync Fedora license list with Wiki rev 84 (Todd Zullinger).
+
 * Thu Aug 16 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.80-3
 - Sync Fedora license list with Wiki rev 68.
 - Move pre-2006 changelog entries to CHANGES.package.old.