[rpmlint/f19] filter out broken-syntax-in-scriptlet-requires (except on el4/5)

[Tom Callaway]

commit 1c9a3364d4ec411c42e406f17b626deeb77ab46a
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Mon Feb 10 16:03:26 2014 -0500

    filter out broken-syntax-in-scriptlet-requires (except on el4/5)

 rpmlint.config     |    9 +++++++--
 rpmlint.config.el4 |    2 ++
 rpmlint.config.el5 |    2 ++
 rpmlint.spec       |    9 ++++++++-
 4 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/rpmlint.config b/rpmlint.config
index 59e78ce..cf6c52b 100644
--- a/rpmlint.config
+++ b/rpmlint.config
@@ -21,7 +21,7 @@ setOption("UseDefaultRunlevels", False)
 setOption("UseEpoch", False)
 setOption("UseUTF8", True)
 setOption("UseVersionInChangeLog", True)
-setOption("ValidSrcPerms", (0664, 0644, ))
+setOption("ValidSrcPerms", (int("664",8), int("644",8), ))
 
 setOption("ValidShells", (
     "<lua>",
@@ -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.17, 31 July 2013" of that page.
+    # Last synced with revision "2.20, 9 February 2014" of that page.
     'AAL',
     'Abstyles',
     'Adobe',
@@ -192,6 +192,7 @@ setOption("ValidLicenses", (
     'Newsletr',
     'NGPL',
     'NLPL',
+    'Nmap',
     'Nokia',
     'NOSL',
     'Noweb',
@@ -223,6 +224,7 @@ setOption("ValidLicenses", (
     'Qhull',
     'QPL',
     'Rdisc',
+    'REX',
     'RiceBSD',
     'Romio',
     'RPSL',
@@ -247,6 +249,7 @@ setOption("ValidLicenses", (
     'Tolua',
     'TORQUEv1.1',
     'TOSL',
+    'TPDL',
     'TPL',
     'UCD',
     'Vim',
@@ -402,6 +405,8 @@ 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/.*$")
+# Fixed in rpm >= 4.7.1
+addFilter("broken-syntax-in-scriptlet-requires") 
 
 # https://bugzilla.redhat.com/496737, https://bugzilla.redhat.com/646455
 for pkg, exe in (("coreutils", "/bin/su"),
diff --git a/rpmlint.config.el4 b/rpmlint.config.el4
index f562611..8c647d7 100644
--- a/rpmlint.config.el4
+++ b/rpmlint.config.el4
@@ -24,3 +24,5 @@ removeFilter("no-%clean-section")
 # (it automatically provides one).
 removeFilter("files-attr-not-set")
 
+# Fixed in rpm >= 4.7.1
+removeFilter("broken-syntax-in-scriptlet-requires")
diff --git a/rpmlint.config.el5 b/rpmlint.config.el5
index 356368d..ae22617 100644
--- a/rpmlint.config.el5
+++ b/rpmlint.config.el5
@@ -20,3 +20,5 @@ removeFilter("no-cleaning-of-buildroot")
 removeFilter("no-buildroot-tag")
 removeFilter("no-%clean-section")
 
+# Fixed in rpm >= 4.7.1
+removeFilter("broken-syntax-in-scriptlet-requires")
diff --git a/rpmlint.spec b/rpmlint.spec
index 674ef03..b12519a 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        1.5
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -111,6 +111,13 @@ make check
 
 
 %changelog
+* Mon Feb 10 2014 Tom Callaway <spot at fedoraproject.org> - 1.5-8
+- filter out broken-syntax-in-scriptlet-requires (except on el4/5)
+- update license list
+
+* Sun Feb  9 2014 Ville Skyttä <ville.skytta at iki.fi> - 1.5-7
+- Make default config Python 3 compatible.
+
 * Thu Dec 12 2013 Tom Callaway <spot at fedoraproject.org> - 1.5-6
 - fix unicode naming bug (bz 1036310)