[rpmlint/el5] update license list

[Tom Callaway]

commit 74ab9b4e9e6f8cda4047c0904e9bdd86eadcc62f
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Wed Oct 9 19:38:05 2013 -0400

    update license list

 rpmlint.config |   68 ++++++++++++++++++++++++++++++++++++++++---------------
 rpmlint.spec   |    5 +++-
 2 files changed, 53 insertions(+), 20 deletions(-)
---
diff --git a/rpmlint.config b/rpmlint.config
index a69f3c3..620c067 100644
--- a/rpmlint.config
+++ b/rpmlint.config
@@ -37,38 +37,44 @@ 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.88, 03 Feb 2011" of that page.
+    # Last synced with revision "2.17, 31 July 2013" of that page.
     'AAL',
     'Abstyles',
     'Adobe',
     'ADSL',
     'AFL',
+    'Afmparse',
     'AGPLv1',
     'AGPLv3',
-    'AGPLv3 with exceptions ',
+    'AGPLv3+',
+    'AGPLv3 with exceptions',
     'AMDPLPA',
     'AML',
     'AMPAS BSD',
+    'APAFML',
+    'APSL 2.0',
+    'APSL 2.0+',
     'ARL',
+    'Artistic 2.0',
+    'Artistic clarified',
     'ASL 1.0',
     'ASL 1.0+',
     'ASL 1.1',
     'ASL 1.1+',
     'ASL 2.0',
     'ASL 2.0+',
-    'APSL 2.0',
-    'APSL 2.0+',
-    'Artistic 2.0',
-    'Artistic clarified',
+    'Bahyph',
     'Barr',
     'Beerware',
     'BeOpen',
+    'Bibtex',
     'BitTorrent',
     'Boost',
     'Borceux',
     'BSD',
     'BSD Protection',
     'BSD with advertising',
+    'BSD with attribution',
     'CATOSL',
     'CC0',
     'CeCILL',
@@ -76,20 +82,25 @@ setOption("ValidLicenses", (
     'CeCILL-C',
     'CDDL',
     'CNRI',
-    'CPAL',
-    'CPL',
     'Condor',
     'Copyright only',
+    'CPAL',
+    'CPL',
     'Crossword',
     'Crystal Stacker',
+    'Cube',
+    'diffmark',
+    'DMIT',
     'DOC',
     'Dotseqn',
+    'DSDP',
     'dvipdfm',
     'ECL 1.0',
     'ECL 2.0',
     'eCos',
     'EFL 2.0',
     'EFL 2.0+',
+    'eGenix',
     'Entessa',
     'EPL',
     'ERPL',
@@ -97,10 +108,13 @@ setOption("ValidLicenses", (
     'EUPL 1.1',
     'Eurosym',
     'Fair',
+    'FSFUL',
+    'FSFULLR',
     'FTL',
     'Giftware',
     'GL2PS',
     'Glide',
+    'Glulxe',
     'gnuplot',
     'GPL+',
     'GPL+ or Artistic',
@@ -116,6 +130,7 @@ setOption("ValidLicenses", (
     'GPLv3 with exceptions',
     'GPLv3+',
     'GPLv3+ with exceptions',
+    'HaskellReport',
     'IBM',
     'IJG',
     'ImageMagick',
@@ -127,9 +142,11 @@ setOption("ValidLicenses", (
     'Jabber',
     'JasPer',
     'JPython',
+    'Julius',
     'Knuth',
     'Latex2e',
     'LBNL BSD',
+    'Leptonica',
     'LGPLv2',
     'LGPLv2 with exceptions',
     'LGPLv2+',
@@ -143,11 +160,15 @@ setOption("ValidLicenses", (
     'libtiff',
     'LLGPL',
     'Logica',
+    'LOSLA',
     'LPL',
     'LPPL',
+    'MakeIndex',
     'mecab-ipadic',
+    'midnight',
     'MirOS',
     'MIT',
+    'MITNFA',
     'MIT with advertising',
     'mod_macro',
     'Motosoto',
@@ -155,22 +176,26 @@ setOption("ValidLicenses", (
     'MPLv1.0+',
     'MPLv1.1',
     'MPLv1.1+',
+    'MPLv2.0',
     'MS-PL',
     'MS-RL',
+    'MTLL',
+    'Mup',
+    'Naumen',
     'NCSA',
     'NetCDF',
-    'NGPL',
-    'NOSL',
-    'Naumen',
     'Netscape',
     'Newmat',
     'Newsletr',
     'NGPL',
+    'NLPL',
     'Nokia',
+    'NOSL',
     'Noweb',
     'OML',
     'OpenLDAP',
     'OpenPBS',
+    'OpenSSL',
     'OReilly',
     'OSL 1.0',
     'OSL 1.0+',
@@ -182,13 +207,13 @@ setOption("ValidLicenses", (
     'OSL 2.1+',
     'OSL 3.0',
     'OSL 3.0+',
-    'OpenSSL',
-    'OReilly',
+    'Par',
     'Phorum',
     'PHP',
     'PlainTeX',
     'Plexus',
     'PostgreSQL',
+    'psfrag',
     'psutils',
     'Public Domain',
     'Python',
@@ -208,18 +233,22 @@ setOption("ValidLicenses", (
     'SISSL',
     'SLIB',
     'SNIA',
+    'softSurfer',
     'SPL',
+    'STMPL',
+    'SWL',
     'TCL',
     'Teeworlds',
     'Threeparttable',
     'TMate',
+    'Tolua',
     'TORQUEv1.1',
     'TOSL',
     'TPL',
     'UCD',
-    'VOSTROM',
     'Vim',
     'VNLSL',
+    'VOSTROM',
     'VSL',
     'W3C',
     'Webmin',
@@ -228,18 +257,19 @@ setOption("ValidLicenses", (
     'wxWidgets',
     'Xerox',
     'xinetd',
+    'xpp',
     'XSkat',
     'YPLv1.1',
     'Zed',
     'Zend',
+    'zlib',
+    'zlib with acknowledgement',
     'ZPLv1.0',
     'ZPLv1.0+',
     'ZPLv2.0',
     'ZPLv2.0+',
     'ZPLv2.1',
     'ZPLv2.1+',
-    'zlib',
-    'zlib with acknowledgement',
     # Documentation licenses
     'CDL',
     'FBSDDL',
@@ -249,11 +279,12 @@ setOption("ValidLicenses", (
     'OFSFDL',
     'Open Publication',
     'Public Use',
+    'Verbatim',
     # Content licenses
     'CC0',
     'CC-BY',
-    'CC-BY-SA',
     'CC-BY-ND',
+    'CC-BY-SA',
     'DMTF',
     'DSL',
     'EFML',
@@ -267,10 +298,9 @@ setOption("ValidLicenses", (
     'Baekmuk',
     'Bitstream Vera',
     'Charter',
-    'DoubleStroke'
+    'DoubleStroke',
     'Elvish',
     'Hershey',
-    'Hershey',
     'IPA',
     'Liberation',
     'LPPL',
diff --git a/rpmlint.spec b/rpmlint.spec
index d7605c6..eabb63c 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        0.94
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  9 2013 Tom Callaway <spot at fedoraproject.org> - 0.94-3
+- update license list
+
 * Tue Feb 15 2011 manuel "lonely wolf" wolfshant <wolfy at fedoraproject.org> - 0.94-2
 - fix Fedora license list