From e66338ab6402b9adcfb3b6826ff0d428f8bfd28800747826183cc09eb4fddb08 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 23 Jan 2018 12:12:00 +0000 Subject: [PATCH] remove xdg-paths-update.diff (merged into other patch) OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=562 --- 0001-Improve-XDG-Menu-checks-stability.patch | 28 ++++++++------------ rpmlint.changes | 1 + rpmlint.spec | 1 - xdg-paths-update.diff | 22 --------------- 4 files changed, 12 insertions(+), 40 deletions(-) delete mode 100644 xdg-paths-update.diff diff --git a/0001-Improve-XDG-Menu-checks-stability.patch b/0001-Improve-XDG-Menu-checks-stability.patch index ba89dac..0067d52 100644 --- a/0001-Improve-XDG-Menu-checks-stability.patch +++ b/0001-Improve-XDG-Menu-checks-stability.patch @@ -14,30 +14,24 @@ rpmlint errors. Also separate the code a little and cleaning it up. create mode 100644 test/binary/menuxdg1-0-0.noarch.rpm create mode 100644 test/test_menuxdg.py -diff --git a/MenuXDGCheck.py b/MenuXDGCheck.py -index 9995255..66912ea 100644 ---- a/MenuXDGCheck.py -+++ b/MenuXDGCheck.py -@@ -8,15 +8,15 @@ +Index: rpmlint-rpmlint-1.10/MenuXDGCheck.py +=================================================================== +--- rpmlint-rpmlint-1.10.orig/MenuXDGCheck.py ++++ rpmlint-rpmlint-1.10/MenuXDGCheck.py +@@ -8,9 +8,9 @@ import os try: - from ConfigParser import RawConfigParser -+ import ConfigParser as cfgparser - except ImportError: +-except: - from configparser import RawConfigParser ++ import ConfigParser as cfgparser ++except ImportError: + import configparser as cfgparser import AbstractCheck from Filter import addDetails, printError, printWarning - from Pkg import getstatusoutput, is_utf8 - --STANDARD_BIN_DIRS = ['/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/'] -+STANDARD_BIN_DIRS = ('/bin', '/sbin', '/usr/bin', '/usr/sbin') - - - class MenuXDGCheck(AbstractCheck.AbstractFilesCheck): -@@ -25,7 +25,52 @@ def __init__(self): +@@ -25,7 +25,52 @@ class MenuXDGCheck(AbstractCheck.Abstrac # $ echo $XDG_DATA_DIRS/applications # /var/lib/menu-xdg:/usr/share AbstractCheck.AbstractFilesCheck.__init__( @@ -91,7 +85,7 @@ index 9995255..66912ea 100644 def check_file(self, pkg, filename): root = pkg.dirName() -@@ -43,25 +88,7 @@ def check_file(self, pkg, filename): +@@ -43,25 +88,7 @@ class MenuXDGCheck(AbstractCheck.Abstrac if not is_utf8(f): printError(pkg, 'non-utf8-desktopfile', filename) @@ -118,7 +112,7 @@ index 9995255..66912ea 100644 check = MenuXDGCheck() -@@ -76,4 +103,15 @@ def check_file(self, pkg, filename): +@@ -76,4 +103,15 @@ addDetails( 'desktopfile-without-binary', '''the .desktop file is for a file not present in the package. You should check the requires or see if this is not a error''', diff --git a/rpmlint.changes b/rpmlint.changes index 445f357..bf92bb3 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -2,6 +2,7 @@ Tue Jan 23 11:05:10 UTC 2018 - dmueller@suse.com - refresh for 0001-Improve-XDG-Menu-checks-stability.patch + remove xdg-paths-update.diff (merged into other patch) ------------------------------------------------------------------- Mon Jan 15 09:15:19 UTC 2018 - krahmer@suse.com diff --git a/rpmlint.spec b/rpmlint.spec index 33f8db4..f585fb6 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -46,7 +46,6 @@ Patch20: usr-arch.diff Patch23: suse-filter-more-verbose.diff Patch24: docdata-examples.diff Patch25: yast-provides.diff -Patch26: xdg-paths-update.diff Patch27: better-wrong-script.diff Patch28: buildroot-doc.diff Patch29: rpmgroup-checks.diff diff --git a/xdg-paths-update.diff b/xdg-paths-update.diff deleted file mode 100644 index 7886f3a..0000000 --- a/xdg-paths-update.diff +++ /dev/null @@ -1,22 +0,0 @@ -From: Some One -Date: Thu, 9 Apr 2015 14:55:38 +0200 -Subject: [PATCH] xdg-paths-update.diff - -=================================================================== ---- - MenuXDGCheck.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: rpmlint-rpmlint-1.10/MenuXDGCheck.py -=================================================================== ---- rpmlint-rpmlint-1.10.orig/MenuXDGCheck.py -+++ rpmlint-rpmlint-1.10/MenuXDGCheck.py -@@ -25,7 +25,7 @@ class MenuXDGCheck(AbstractCheck.Abstrac - # $ echo $XDG_DATA_DIRS/applications - # /var/lib/menu-xdg:/usr/share - AbstractCheck.AbstractFilesCheck.__init__( -- self, "MenuXDGCheck", r"/usr/share/applications/.*\.desktop$") -+ self, "MenuXDGCheck", r"(?:/usr/share|/etc/opt/.*/share|/opt/.*)/applications/.*\.desktop$") - - def check_file(self, pkg, filename): - root = pkg.dirName()