[rpmlint/f17] 1.5

[Tom Callaway]

commit 1d35711cb3e09344a8ca8da167ab4a9cc673c54a
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Fri May 17 13:42:23 2013 -0400

    1.5

 rpmlint.config |    3 ++-
 rpmlint.spec   |   26 ++++++--------------------
 sources        |    2 +-
 3 files changed, 9 insertions(+), 22 deletions(-)
---
diff --git a/rpmlint.config b/rpmlint.config
index 536efc9..094274f 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.12, 4 March 2013" of that page.
+    # Last synced with revision "2.13, 8 May 2013" of that page.
     'AAL',
     'Abstyles',
     'Adobe',
@@ -233,6 +233,7 @@ setOption("ValidLicenses", (
     'SISSL',
     'SLIB',
     'SNIA',
+    'softSurfer',
     'SPL',
     'STMPL',
     'SWL',
diff --git a/rpmlint.spec b/rpmlint.spec
index 8c7776e..964cffb 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,6 +1,6 @@
 Name:           rpmlint
-Version:        1.4
-Release:        14%{?dist}
+Version:        1.5
+Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -14,18 +14,6 @@ Source3:        %{name}-etc.config
 Source4:        %{name}.config.el4
 # EL-5 specific config
 Source5:        %{name}.config.el5
-Patch0: rpmlint-1.4-encoding.patch
-# http://sourceforge.net/p/rpmlint/code/ci/671bf6d21c6e878e6ee551ee4e2871df8947ac52/
-Patch1: rpmlint-1.4-py3-magic-number-fix.patch
-# Tighten macro regexp to min 3 chars, starting with a letter or underscore.
-# http://sourceforge.net/p/rpmlint/code/ci/ae8a019e53784a45c59f23a7b09ad47ea7584795/
-Patch2: rpmlint-1.4-tighten-macro-regexp.patch
-# Fix handling of Ruby RI files as text files, they're always binary files.
-# http://rpmlint.zarb.org/cgi-bin/trac.cgi/ticket/569
-Patch3: rpmlint-1.4-ruby-ri-files-are-binary.patch
-# Fix lua binary detection
-# http://sourceforge.net/p/rpmlint/code/ci/be327c1
-Patch4: rpmlint-1.4-lua-bytecode-fix.patch
 
 BuildArch:      noarch
 BuildRequires:  python >= 2.4
@@ -61,11 +49,6 @@ and source packages as well as spec files can be checked.
 
 %prep
 %setup -q
-%patch0 -p1 -b .enc
-%patch1 -p1 -b .py3
-%patch2 -p1 -b .tighten-regexp
-%patch3 -p1 -b .ruby-ri-files
-%patch4 -p1 -b .luafix
 sed -i -e /MenuCheck/d Config.py
 cp -p config config.example
 install -pm 644 %{SOURCE2} CHANGES.package.old
@@ -98,7 +81,7 @@ make check
 
 
 %files
-%doc AUTHORS COPYING ChangeLog CHANGES.package.old README config.example
+%doc COPYING ChangeLog CHANGES.package.old README config.example
 %config(noreplace) %{_sysconfdir}/rpmlint/
 %if 0%{?fedora} >= 17
 %{_datadir}/bash-completion/
@@ -116,6 +99,9 @@ make check
 
 
 %changelog
+* Fri May 17 2013 Tom Callaway <spot at fedoraproject.org> - 1.5-1
+- update to 1.5
+
 * Mon Apr  1 2013 Tom Callaway <spot at fedoraproject.org> - 1.4-14
 - explicitly Require: perl (bz919865)
 - fix lua binary detection (bz919869)
diff --git a/sources b/sources
index 6c271e9..e3480ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bfbdd78847ca2b253c2e4e65c41f49e2  rpmlint-1.4.tar.xz
+d7e82d97211ba0128ef864c7eac2fab8  rpmlint-1.5.tar.xz