diff --git a/rpmlint.changes b/rpmlint.changes index 270d23f..2b5c4de 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 6 09:21:04 UTC 2013 - dmueller@suse.com + +- add xdg-check-exception.diff: + handle xdg menu files without exec entry (bnc#833384) + ------------------------------------------------------------------- Wed Jul 31 11:42:54 UTC 2013 - meissner@suse.com diff --git a/rpmlint.spec b/rpmlint.spec index 45c5cd5..9ef7fbd 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -122,6 +122,7 @@ Patch89: suse-python-abi-check.diff Patch91: suse-manpages-for-rc-scripts.patch # PATCH-FIX-UPSTREAM: lnussel@suse.de - Fix setgroups error name Patch92: rpmlint-1.5-Fix-setgroups-error-name.diff +Patch93: xdg-check-exception.diff %py_requires @@ -198,6 +199,7 @@ source packages can be checked. %patch89 %patch91 -p1 %patch92 -p1 +%patch93 -p1 cp -p %{SOURCE2} . # Only move top-level python files chmod 0755 rpmlint-checks-master/*.py diff --git a/xdg-check-exception.diff b/xdg-check-exception.diff new file mode 100644 index 0000000..39fd135 --- /dev/null +++ b/xdg-check-exception.diff @@ -0,0 +1,27 @@ +diff --git a/MenuXDGCheck.py b/MenuXDGCheck.py +index 0996585..29085d5 100644 +--- a/MenuXDGCheck.py ++++ b/MenuXDGCheck.py +@@ -40,13 +40,16 @@ class MenuXDGCheck(AbstractCheck.AbstractFilesCheck): + printError(pkg, 'non-utf8-desktopfile', filename) + + self.cfp.read(f) +- binary = self.cfp.get('Desktop Entry','Exec').split(' ',1)[0] ++ binary = None + 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 self.cfp.has_option('Desktop Entry','Exec'): ++ binary = self.cfp.get('Desktop Entry','Exec').split(' ',1)[0] ++ ++ 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) +