From 259364fd5ed45f8184366aacc8d43dfd174db50c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 1 Nov 2010 23:31:14 +0200
Subject: [PATCH] Sync Fedora license list with Wiki revision 1.85.

---
 rpmlint.config | 14 ++++++++++++--
 rpmlint.spec   |  1 +
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/rpmlint.config b/rpmlint.config
index e772cd9..3c4d6e3 100644
--- a/rpmlint.config
+++ b/rpmlint.config
@@ -40,8 +40,9 @@ 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.80, 16 August 2010" of that page.
+    # Last synced with revision "1.85, 21 October 2010" of that page.
     'AAL',
+    'Abstyles',
     'Adobe',
     'ADSL',
     'AFL',
@@ -62,7 +63,7 @@ setOption("ValidLicenses", (
     'ASL 1.1+',
     'ASL 2.0',
     'ASL 2.0+',
-    'Beerware',
+    'Barr',
     'BeOpen',
     'BitTorrent',
     'Boost',
@@ -80,8 +81,10 @@ setOption("ValidLicenses", (
     'Copyright only',
     'CPAL',
     'CPL',
+    'Crossword',
     'Crystal Stacker',
     'DOC',
+    'Dotseqn',
     'dvipdfm',
     'ECL 1.0',
     'ECL 2.0',
@@ -126,6 +129,7 @@ setOption("ValidLicenses", (
     'JasPer',
     'JPython',
     'Knuth',
+    'Latex2e',
     'LBNL BSD',
     'LGPLv2',
     'LGPLv2 with exceptions',
@@ -136,6 +140,7 @@ setOption("ValidLicenses", (
     'LGPLv3 with exceptions',
     'LGPLv3+',
     'LGPLv3+ with exceptions',
+    'Lhcyr',
     'libtiff',
     'LLGPL',
     'Logica',
@@ -158,6 +163,7 @@ setOption("ValidLicenses", (
     'NetCDF',
     'Netscape',
     'Newmat',
+    'Newsletr',
     'NGPL',
     'Nokia',
     'NOSL',
@@ -191,6 +197,7 @@ setOption("ValidLicenses", (
     'RiceBSD',
     'Romio',
     'RPSL',
+    'Rsfs',
     'Ruby',
     'Saxpath',
     'SCEA',
@@ -203,6 +210,7 @@ setOption("ValidLicenses", (
     'SPL',
     'TCL',
     'Teeworlds',
+    'Threeparttable',
     'TMate',
     'TOSL',
     'TPL',
@@ -213,12 +221,14 @@ setOption("ValidLicenses", (
     'VSL',
     'W3C',
     'Webmin',
+    'Wsuipa',
     'WTFPL',
     'wxWidgets',
     'Xerox',
     'xinetd',
     'XSkat',
     'YPLv1.1',
+    'Zed',
     'Zend',
     'zlib',
     'zlib with acknowledgement',
diff --git a/rpmlint.spec b/rpmlint.spec
index 265226c..4f5c459 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -79,6 +79,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Nov  1 2010 Ville Skyttä <ville.skytta@iki.fi>
+- Sync Fedora license list with Wiki revision 1.85.
 - Whitelist more expectedly setuid executables; fixes #646455.
 
 * Thu Aug 19 2010 Ville Skyttä <ville.skytta@iki.fi> - 0.99-1