rpm/rpmlint
SHA256
1
0
Fork 0
forked from pool/rpmlint
Code Pull Requests Activity

remove xdg-paths-update.diff (merged into other patch)

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=562
This commit is contained in:
Dirk Mueller 2018-01-23 12:12:00 +00:00 committed by Git OBS Bridge
parent f6b9684380
commit e66338ab64
4 changed files with 12 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
0001-Improve-XDG-Menu-checks-stability.patch
View File

@ -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/binary/menuxdg1-0-0.noarch.rpm
create mode 100644 test/test_menuxdg.py create mode 100644 test/test_menuxdg.py
diff --git a/MenuXDGCheck.py b/MenuXDGCheck.py Index: rpmlint-rpmlint-1.10/MenuXDGCheck.py
index 9995255..66912ea 100644 ===================================================================
--- a/MenuXDGCheck.py --- rpmlint-rpmlint-1.10.orig/MenuXDGCheck.py
+++ b/MenuXDGCheck.py +++ rpmlint-rpmlint-1.10/MenuXDGCheck.py
@@ -8,15 +8,15 @@ @@ -8,9 +8,9 @@
import os import os
try: try:
- from ConfigParser import RawConfigParser - from ConfigParser import RawConfigParser
+ import ConfigParser as cfgparser -except:
except ImportError:
- from configparser import RawConfigParser - from configparser import RawConfigParser
+ import ConfigParser as cfgparser
+except ImportError:
+ import configparser as cfgparser + import configparser as cfgparser
import AbstractCheck import AbstractCheck
from Filter import addDetails, printError, printWarning from Filter import addDetails, printError, printWarning
from Pkg import getstatusoutput, is_utf8 @@ -25,7 +25,52 @@ class MenuXDGCheck(AbstractCheck.Abstrac
-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):
# $ echo $XDG_DATA_DIRS/applications # $ echo $XDG_DATA_DIRS/applications
# /var/lib/menu-xdg:/usr/share # /var/lib/menu-xdg:/usr/share
AbstractCheck.AbstractFilesCheck.__init__( AbstractCheck.AbstractFilesCheck.__init__(
@ -91,7 +85,7 @@ index 9995255..66912ea 100644
def check_file(self, pkg, filename): def check_file(self, pkg, filename):
root = pkg.dirName() 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): if not is_utf8(f):
printError(pkg, 'non-utf8-desktopfile', filename) printError(pkg, 'non-utf8-desktopfile', filename)
@ -118,7 +112,7 @@ index 9995255..66912ea 100644
check = MenuXDGCheck() check = MenuXDGCheck()
@@ -76,4 +103,15 @@ def check_file(self, pkg, filename): @@ -76,4 +103,15 @@ addDetails(
'desktopfile-without-binary', 'desktopfile-without-binary',
'''the .desktop file is for a file not present in the package. You '''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''', should check the requires or see if this is not a error''',

1
rpmlint.changes
View File

@ -2,6 +2,7 @@
Tue Jan 23 11:05:10 UTC 2018 - dmueller@suse.com Tue Jan 23 11:05:10 UTC 2018 - dmueller@suse.com
- refresh for 0001-Improve-XDG-Menu-checks-stability.patch - 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 Mon Jan 15 09:15:19 UTC 2018 - krahmer@suse.com

1
rpmlint.spec
View File

@ -46,7 +46,6 @@ Patch20: usr-arch.diff
Patch23: suse-filter-more-verbose.diff Patch23: suse-filter-more-verbose.diff
Patch24: docdata-examples.diff Patch24: docdata-examples.diff
Patch25: yast-provides.diff Patch25: yast-provides.diff
Patch26: xdg-paths-update.diff
Patch27: better-wrong-script.diff Patch27: better-wrong-script.diff
Patch28: buildroot-doc.diff Patch28: buildroot-doc.diff
Patch29: rpmgroup-checks.diff Patch29: rpmgroup-checks.diff

22
xdg-paths-update.diff
View File

@ -1,22 +0,0 @@
From: Some One <nobody@opensuse.org>
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()