update license list, fix desktop file parsing

rpmlint-1.5-desktopfix.patch

@@ -0,0 +1,31 @@
+diff -up rpmlint-1.5/MenuXDGCheck.py.desktopfix rpmlint-1.5/MenuXDGCheck.py
+--- rpmlint-1.5/MenuXDGCheck.py.desktopfix	2013-10-09 19:33:21.067330420 -0400
++++ rpmlint-1.5/MenuXDGCheck.py	2013-10-09 19:33:50.422330861 -0400
+@@ -41,14 +41,19 @@ class MenuXDGCheck(AbstractCheck.Abstrac
+ 
+         self.cfp.read(f)
+         binary = self.cfp.get('Desktop Entry','Exec').split(' ',1)[0]
+-        found = False
+-        for i in STANDARD_BIN_DIRS:
+-            if os.path.exists(root + i + binary):
+-                # no need to check if the binary is +x, rpmlint does it
+-                # in another place
+-                found = True
+-        if not found and binary:
+-            printWarning(pkg, 'desktopfile-without-binary', filename, binary)
++        if binary:
++            if binary.startswith('/'):
++                found = os.path.exists(root + binary)
++            else:
++                for i in STANDARD_BIN_DIRS:
++                    if os.path.exists(root + i + binary):
++                        # no need to check if the binary is +x, rpmlint does it
++                        # in another place
++                        found = True
++                        break
++            if not found:
++                printWarning(pkg, 'desktopfile-without-binary', filename,
++                             binary)
+ 
+ check = MenuXDGCheck()
+ 

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.13, 8 May 2013" of that page.
+    # Last synced with revision "2.17, 31 July 2013" of that page.
     'AAL',
     'Abstyles',
     'Adobe',
@@ -49,6 +49,7 @@ setOption("ValidLicenses", (
     'Afmparse',
     'AGPLv1',
     'AGPLv3',
+    'AGPLv3+',
     'AGPLv3 with exceptions',
     'AMDPLPA',
     'AML',
@@ -92,6 +93,7 @@ setOption("ValidLicenses", (
     'Crystal Stacker',
     'Cube',
     'diffmark',
+    'DMIT',
     'DOC',
     'Dotseqn',
     'DSDP',
@@ -161,6 +163,7 @@ setOption("ValidLicenses", (
     'libtiff',
     'LLGPL',
     'Logica',
+    'LOSLA',
     'LPL',
     'LPPL',
     'MakeIndex',
@@ -241,6 +244,7 @@ setOption("ValidLicenses", (
     'Teeworlds',
     'Threeparttable',
     'TMate',
+    'Tolua',
     'TORQUEv1.1',
     'TOSL',
     'TPL',

rpmlint.spec

@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        1.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -14,6 +14,8 @@ Source3:        %{name}-etc.config
 Source4:        %{name}.config.el4
 # EL-5 specific config
 Source5:        %{name}.config.el5
+# http://sourceforge.net/p/rpmlint/code/ci/f85186d/
+Patch0:		rpmlint-1.5-desktopfix.patch
 
 BuildArch:      noarch
 BuildRequires:  python >= 2.4
@@ -49,6 +51,7 @@ and source packages as well as spec files can be checked.
 
 %prep
 %setup -q
+%patch0 -p1 -b .desktopfix
 sed -i -e /MenuCheck/d Config.py
 cp -p config config.example
 install -pm 644 %{SOURCE2} CHANGES.package.old
@@ -99,6 +102,10 @@ make check
 
 
 %changelog
+* Wed Oct  9 2013 Tom Callaway <spot@fedoraproject.org> - 1.5-4
+- Fix handling of Exec= with an absolute path (bz991278)
+- Update license list, add AGPLv3+ (bz894187)
+
 * Tue Aug  6 2013 Thomas Woerner <twoerner@redhat.com> - 1.5-3
 - Fixed URL and Source0, now using sourceforge.net