[rpmlint/f18] exclude non config files that live in /etc, update license list

[Tom Callaway]

commit 3c707d97470244e259b135146d24febd65602c68
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Wed Mar 6 16:10:46 2013 -0500

    exclude non config files that live in /etc, update license list

 rpmlint.config |   16 +++++++++++++++-
 rpmlint.spec   |    9 ++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/rpmlint.config b/rpmlint.config
index aaf249d..536efc9 100644
--- a/rpmlint.config
+++ b/rpmlint.config
@@ -40,18 +40,20 @@ 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.03, 13 August 2012" of that page.
+    # Last synced with revision "2.12, 4 March 2013" of that page.
     'AAL',
     'Abstyles',
     'Adobe',
     'ADSL',
     'AFL',
+    'Afmparse',
     'AGPLv1',
     'AGPLv3',
     'AGPLv3 with exceptions',
     'AMDPLPA',
     'AML',
     'AMPAS BSD',
+    'APAFML',
     'APSL 2.0',
     'APSL 2.0+',
     'ARL',
@@ -88,6 +90,7 @@ setOption("ValidLicenses", (
     'CPL',
     'Crossword',
     'Crystal Stacker',
+    'Cube',
     'diffmark',
     'DOC',
     'Dotseqn',
@@ -106,6 +109,8 @@ setOption("ValidLicenses", (
     'EUPL 1.1',
     'Eurosym',
     'Fair',
+    'FSFUL',
+    'FSFULLR',
     'FTL',
     'Giftware',
     'GL2PS',
@@ -163,6 +168,7 @@ setOption("ValidLicenses", (
     'midnight',
     'MirOS',
     'MIT',
+    'MITNFA',
     'MIT with advertising',
     'mod_macro',
     'Motosoto',
@@ -173,6 +179,8 @@ setOption("ValidLicenses", (
     'MPLv2.0',
     'MS-PL',
     'MS-RL',
+    'MTLL',
+    'Mup',
     'Naumen',
     'NCSA',
     'NetCDF',
@@ -226,6 +234,8 @@ setOption("ValidLicenses", (
     'SLIB',
     'SNIA',
     'SPL',
+    'STMPL',
+    'SWL',
     'TCL',
     'Teeworlds',
     'Threeparttable',
@@ -267,6 +277,7 @@ setOption("ValidLicenses", (
     'OFSFDL',
     'Open Publication',
     'Public Use',
+    'Verbatim',
     # Content licenses
     'CC-BY',
     'CC-BY-ND',
@@ -383,6 +394,9 @@ addFilter("non-ghost-in-var-run")
 # Someone thought it was a good idea to make .desktop files executable. They were wrong.
 # Nevertheless, I do not yet control the universe, so we squelch the error here.
 addFilter("script-without-shebang .*\.desktop$")
+# Some files in /etc/ are not meant to be modified by the sysadmin
+addFilter("non-conffile-in-etc /etc/rpm/.*$")
+addFilter("non-conffile-in-etc /etc/rc.d/init.d/.*$")
 
 # https://bugzilla.redhat.com/496737, https://bugzilla.redhat.com/646455
 for pkg, exe in (("coreutils", "/bin/su"),
diff --git a/rpmlint.spec b/rpmlint.spec
index 958c90d..b9d12a8 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        1.4
-Release:        11%{?dist}
+Release:        13%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -110,6 +110,13 @@ make check
 
 
 %changelog
+* Wed Mar  6 2013 Tom Callaway <spot at fedoraproject.org> - 1.4-13
+- update license list
+- exclude non-config files that live in /etc
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Tue Nov  6 2012 Tom Callaway <spot at fedoraproject.org> - 1.4-11
 - add Requires: %{_bindir}/groff for man page checks (bz 873448)