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

Accepting request 77409 from devel:openSUSE:Factory:rpmlint

Browse Source 
- add org.freedesktop.DisplayManager.conf (bnc#708205)

- remove obsolete knotification-requires check
- bump obsolete openSUSE version to 11.2

OBS-URL: https://build.opensuse.org/request/show/77409
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=131
This commit is contained in:
Sascha Peilicke 2011-07-29 11:48:11 +00:00 committed by Git OBS Bridge
commit 6df4635067
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CheckKDE4Deps.py
View File

@ -53,10 +53,6 @@ _kde4_libakonadi4 = (
"libakonadiprotocolinternals.so.1", "libakonadiprotocolinternals.so.1",
) )
_kde4_knotificationdep = (
"libknotificationitem-1.so",
)
class KDE4Check(AbstractCheck.AbstractCheck): class KDE4Check(AbstractCheck.AbstractCheck):
def __init__(self): def __init__(self):
AbstractCheck.AbstractCheck.__init__(self, "CheckKDE4Deps") AbstractCheck.AbstractCheck.__init__(self, "CheckKDE4Deps")
@ -108,8 +104,6 @@ class KDE4Check(AbstractCheck.AbstractCheck):
printError(pkg,"suse-kde4-excessive-dependency", "%kde4_akonadi_requires") printError(pkg,"suse-kde4-excessive-dependency", "%kde4_akonadi_requires")
if not "akonadi-runtime" in pkg_requires and libakonadi4_dep: if not "akonadi-runtime" in pkg_requires and libakonadi4_dep:
printError(pkg,"suse-kde4-missing-dependency", "%kde4_akonadi_requires") printError(pkg,"suse-kde4-missing-dependency", "%kde4_akonadi_requires")
if not "libknotificationitem-1" in pkg_requires and _kde4_knotificationdep:
printError(pkg, "suse-kde4-missing-dependency", "kde4_knotification_requires")
check=KDE4Check() check=KDE4Check()

3
config
View File

@ -279,7 +279,6 @@ setOption('DanglingSymlinkExceptions',
setOption("DBUSServices.WhiteList", ( setOption("DBUSServices.WhiteList", (
"ConsoleKit.conf", "ConsoleKit.conf",
"hal.conf", "hal.conf",
"org.freedesktop.Hal.service",
"cups.conf", # bnc#515977 "cups.conf", # bnc#515977
"org.freedesktop.ConsoleKit.service", "org.freedesktop.ConsoleKit.service",
"org.freedesktop.PolicyKit.conf", "org.freedesktop.PolicyKit.conf",
@ -434,6 +433,8 @@ setOption("DBUSServices.WhiteList", (
# colord (bnc#698250) # colord (bnc#698250)
"org.freedesktop.ColorManager.service", "org.freedesktop.ColorManager.service",
"org.freedesktop.ColorManager.conf", "org.freedesktop.ColorManager.conf",
# lightdm (bnc#708205)
"org.freedesktop.DisplayManager.conf",
)) ))
# Output filters # Output filters

11
rpmlint.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Jul 29 09:29:19 UTC 2011 - lnussel@suse.de
- add org.freedesktop.DisplayManager.conf (bnc#708205)
-------------------------------------------------------------------
Sat Jul 23 11:35:02 UTC 2011 - toddrme2178@gmail.com
- remove obsolete knotification-requires check
- bump obsolete openSUSE version to 11.2
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 14 09:07:59 UTC 2011 - lnussel@suse.de Thu Jul 14 09:07:59 UTC 2011 - lnussel@suse.de

2
suse-version.diff
View File

@ -15,7 +15,7 @@ Index: SpecCheck.py
package_noarch[current_package] = True package_noarch[current_package] = True
+ res = suse_version_regex.search(line) + res = suse_version_regex.search(line)
+ if res and int(res.group(1)) > 0 and int(res.group(1)) < 1110: + if res and int(res.group(1)) > 0 and int(res.group(1)) < 1130:
+ printWarning(pkg, "obsolete-suse-version-check", res.group(1)) + printWarning(pkg, "obsolete-suse-version-check", res.group(1))
+ elif res and int(res.group(1)) > 1140: + elif res and int(res.group(1)) > 1140:
+ printError(pkg, "invalid-suse-version-check", res.group(1)) + printError(pkg, "invalid-suse-version-check", res.group(1))