[rpmlint/f20] update license list in config

[Tom Callaway]

commit 22d4dd996a09cd4d78fae6da6d7c5d7b51a1ec69
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Tue Dec 9 14:41:52 2014 -0500

    update license list in config

 rpmlint.config |    7 ++++++-
 rpmlint.spec   |    5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/rpmlint.config b/rpmlint.config
index 1ad7ab3..75caea1 100644
--- a/rpmlint.config
+++ b/rpmlint.config
@@ -40,7 +40,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 "2.20, 9 February 2014" of that page.
+    # Last synced with revision "2.25, 2 December 2014" of that page.
     'AAL',
     'Abstyles',
     'Adobe',
@@ -55,6 +55,7 @@ setOption("ValidLicenses", (
     'AML',
     'AMPAS BSD',
     'APAFML',
+    'App-s2p',
     'APSL 2.0',
     'APSL 2.0+',
     'ARL',
@@ -244,6 +245,8 @@ setOption("ValidLicenses", (
     'SWL',
     'TCL',
     'Teeworlds',
+    'TGPPL',
+    'TGPPL with exceptions',
     'Threeparttable',
     'TMate',
     'Tolua',
@@ -252,6 +255,8 @@ setOption("ValidLicenses", (
     'TPDL',
     'TPL',
     'UCD',
+    'Unicode',
+    'Unlicense',
     'Vim',
     'VNLSL',
     'VOSTROM',
diff --git a/rpmlint.spec b/rpmlint.spec
index a156d40..a9e7a0b 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        1.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 Group:          Development/Tools
 License:        GPLv2
@@ -99,6 +99,9 @@ make check
 %{_mandir}/man1/rpmlint.1*
 
 %changelog
+* Tue Dec  9 2014 Tom Callaway <spot at fedoraproject.org> - 1.6-2
+- update license list in config file
+
 * Thu Sep  4 2014 Tom Callaway <spot at fedoraproject.org> - 1.6-1
 - update to 1.6