From 1f0d2b3dfa4fe599b2e81e75128b6faf129be484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sat, 26 Jul 2008 17:09:14 +0000
Subject: [PATCH] - 0.84, fixes #355861, #456304. - Sync Fedora license list
 with Wiki revision "16:08, 18 July 2008".

---
 .cvsignore     |  2 +-
 rpmlint.config | 15 ++++++++++++---
 rpmlint.spec   |  6 +++++-
 sources        |  2 +-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 75368d2..df8a199 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rpmlint-0.83.tar.bz2
+rpmlint-0.84.tar.bz2
diff --git a/rpmlint.config b/rpmlint.config
index e707225..c51ec4a 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 "16:08, 18 July 2008" of that page.
     'Adobe',
     'ADSL',
     'AFL',
@@ -56,17 +56,20 @@ setOption("ValidLicenses", (
     '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+',
@@ -101,11 +104,13 @@ setOption("ValidLicenses", (
     'LGPLv3+',
     'LGPLv3+ with exceptions',
     'libtiff',
+    'LLGPL',
     'LPL',
     'LPPL',
     'mecab-ipadic',
     'MIT',
     'MIT with advertising',
+    'Motosoto',
     'MPLv1.0',
     'MPLv1.0+',
     'MPLv1.1',
@@ -126,6 +131,8 @@ setOption("ValidLicenses", (
     'OSL 1.1+',
     'OSL 2.0',
     'OSL 2.0+',
+    'OSL 2.1',
+    'OSL 2.1+',
     'OSL 3.0',
     'OSL 3.0+',
     'OpenSSL',
@@ -138,6 +145,7 @@ setOption("ValidLicenses", (
     'RiceBSD',
     'RPSL',
     'Ruby',
+    'SCRIP',
     'Sendmail',
     'Sleepycat',
     'SISSL',
@@ -154,6 +162,7 @@ setOption("ValidLicenses", (
     'wxWidgets',
     'Xerox',
     'xinetd',
+    'YPLv1.1',
     'Zend',
     'ZPLv1.0',
     'ZPLv1.0+',
diff --git a/rpmlint.spec b/rpmlint.spec
index afc2e75..3070631 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,5 +1,5 @@
 Name:           rpmlint
-Version:        0.83
+Version:        0.84
 Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
@@ -68,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jul 26 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.84-1
+- 0.84, fixes #355861, #456304.
+- Sync Fedora license list with Wiki revision "16:08, 18 July 2008".
+
 * Tue May 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.83-1
 - 0.83, fixes #237204, #428096, #430206, #433783, #434694, #444441.
 - Fedora licensing patch applied upstream.
diff --git a/sources b/sources
index a4210a1..4afa93f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-674e6d64330811abcee4d2acdbbd00e2  rpmlint-0.83.tar.bz2
+d7e2aab6135a44a845f677d27f2722bd  rpmlint-0.84.tar.bz2