[rpmlint/el5/master] Fix list of valid licenses

[Manuel Wolfshant]

commit d50d2480051148f69c368051068bfe672477634d
Author: Manuel Wolfshant <wolfy at fedoraproject.org>
Date:   Tue Feb 15 21:35:30 2011 +0200

    Fix list of valid licenses

 rpmlint.config |   30 ++++++++++++++++++------------
 rpmlint.spec   |    5 ++++-
 2 files changed, 22 insertions(+), 13 deletions(-)
---
diff --git a/rpmlint.config b/rpmlint.config
index 33e04ed..a69f3c3 100644
--- a/rpmlint.config
+++ b/rpmlint.config
@@ -45,7 +45,9 @@ setOption("ValidLicenses", (
     'AFL',
     'AGPLv1',
     'AGPLv3',
+    'AGPLv3 with exceptions ',
     'AMDPLPA',
+    'AML',
     'AMPAS BSD',
     'ARL',
     'ASL 1.0',
@@ -63,7 +65,7 @@ setOption("ValidLicenses", (
     'BeOpen',
     'BitTorrent',
     'Boost',
-	'Borceux',
+    'Borceux',
     'BSD',
     'BSD Protection',
     'BSD with advertising',
@@ -78,10 +80,10 @@ setOption("ValidLicenses", (
     'CPL',
     'Condor',
     'Copyright only',
-	'Crossword',
+    'Crossword',
     'Crystal Stacker',
     'DOC',
-	'Dotseqn',
+    'Dotseqn',
     'dvipdfm',
     'ECL 1.0',
     'ECL 2.0',
@@ -126,7 +128,7 @@ setOption("ValidLicenses", (
     'JasPer',
     'JPython',
     'Knuth',
-	'Latex2e',
+    'Latex2e',
     'LBNL BSD',
     'LGPLv2',
     'LGPLv2 with exceptions',
@@ -137,7 +139,7 @@ setOption("ValidLicenses", (
     'LGPLv3 with exceptions',
     'LGPLv3+',
     'LGPLv3+ with exceptions',
-	'Lhcyr',
+    'Lhcyr',
     'libtiff',
     'LLGPL',
     'Logica',
@@ -154,6 +156,7 @@ setOption("ValidLicenses", (
     'MPLv1.1',
     'MPLv1.1+',
     'MS-PL',
+    'MS-RL',
     'NCSA',
     'NetCDF',
     'NGPL',
@@ -161,10 +164,11 @@ setOption("ValidLicenses", (
     'Naumen',
     'Netscape',
     'Newmat',
-	'Newsletr',
+    'Newsletr',
+    'NGPL',
     'Nokia',
     'Noweb',
-	'OML',
+    'OML',
     'OpenLDAP',
     'OpenPBS',
     'OReilly',
@@ -184,6 +188,7 @@ setOption("ValidLicenses", (
     'PHP',
     'PlainTeX',
     'Plexus',
+    'PostgreSQL',
     'psutils',
     'Public Domain',
     'Python',
@@ -191,8 +196,9 @@ setOption("ValidLicenses", (
     'QPL',
     'Rdisc',
     'RiceBSD',
+    'Romio',
     'RPSL',
-	'Rsfs',
+    'Rsfs',
     'Ruby',
     'Saxpath',
     'SCEA',
@@ -205,9 +211,9 @@ setOption("ValidLicenses", (
     'SPL',
     'TCL',
     'Teeworlds',
-	'Threeparttable',
+    'Threeparttable',
     'TMate',
-	'TORQUEv1.1',
+    'TORQUEv1.1',
     'TOSL',
     'TPL',
     'UCD',
@@ -217,14 +223,14 @@ setOption("ValidLicenses", (
     'VSL',
     'W3C',
     'Webmin',
-	'Wsuipa',
+    'Wsuipa',
     'WTFPL',
     'wxWidgets',
     'Xerox',
     'xinetd',
     'XSkat',
     'YPLv1.1',
-	'Zed',
+    'Zed',
     'Zend',
     'ZPLv1.0',
     'ZPLv1.0+',
diff --git a/rpmlint.spec b/rpmlint.spec
index 866c721..d7605c6 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        0.94
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Feb 15 2011 manuel "lonely wolf" wolfshant <wolfy at fedoraproject.org> - 0.94-2
+- fix Fedora license list
+
 * Tue Feb 15 2011 manuel "lonely wolf" wolfshant <wolfy at fedoraproject.org> - 0.94-1
 - Update to 0.94, based on the package from RHEL-6
 - fixes rhbz#677479 ( patch idea from Ville Skyttä )