Accepting request 200555 from devel:openSUSE:Factory:rpmlint

- whitelist second iteration of wicked dbus service names (bnc#783932) - blacklist old systemd/udev directories (bnc#816467) - remove checking for groups (bnc#767551) - ignore icon size mismatches on animated icons (bnc#480664) - update obsolete/invalid suse version check OBS-URL: https://build.opensuse.org/request/show/200555 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=202
2013-09-26 05:15:05 +00:00 · 2013-09-26 05:15:05 +00:00 · 19447bd8c4
commit 19447bd8c4
parent 72f01fd73f fae8c13012
6 changed files with 26 additions and 255 deletions
--- a/8
+++ b/8
@ -67,6 +67,8 @@ setOption("UseUTF8", 1)
 setOption("CompressExtension", None)
 setOption('UseVarLockSubsys', False)

+setOption('ValidGroups', [])
+
 setOption('StandardGroups', (
    'aegis',
    'antivir',
@ -561,6 +563,12 @@ setOption("DBUSServices.WhiteList", (
    "wicked-dhcp6.conf",
    "wicked-autoip4.conf",
    "wicked.conf",
+    ## next revision of names (old ones could go)
+    "org.opensuse.Network.conf",
+    "org.opensuse.Network.AUTO4.conf",
+    "org.opensuse.Network.DHCP6.conf",
+    "org.opensuse.Network.DHCP4.conf",
+    "org.opensuse.Network.Nanny.conf",
    # systemd machined service (bnc#828207)
    "org.freedesktop.machine1.service",
    "org.freedesktop.machine1.conf",
--- a/rpmgroups.config
+++ b/rpmgroups.config
@ -1,248 +0,0 @@
-from Config import *
-
-setOption("ValidGroups", (
-    "Amusements/Games/3D/Other" ,\
-    "Amusements/Games/3D/Race" ,\
-    "Amusements/Games/3D/Shoot" ,\
-    "Amusements/Games/3D/Simulation" ,\
-    "Amusements/Games/Action/Arcade" ,\
-    "Amusements/Games/Action/Breakout" ,\
-    "Amusements/Games/Action/Other" ,\
-    "Amusements/Games/Action/Race" ,\
-    "Amusements/Games/Action/Shoot" ,\
-    "Amusements/Games/Board/Card" ,\
-    "Amusements/Games/Board/Chess" ,\
-    "Amusements/Games/Board/Other" ,\
-    "Amusements/Games/Board/Pool" ,\
-    "Amusements/Games/Board/Puzzle" ,\
-    "Amusements/Games/Logic" ,\
-    "Amusements/Games/Other" ,\
-    "Amusements/Games/RPG" ,\
-    "Amusements/Games/Strategy/Other" ,\
-    "Amusements/Games/Strategy/Real Time" ,\
-    "Amusements/Games/Strategy/Turn Based" ,\
-    "Amusements/Teaching/Language" ,\
-    "Amusements/Teaching/Mathematics" ,\
-    "Amusements/Teaching/Other" ,\
-    "Amusements/Toys/Background" ,\
-    "Amusements/Toys/Clocks" ,\
-    "Amusements/Toys/Graphics" ,\
-    "Amusements/Toys/Other" ,\
-    "Amusements/Toys/Screensavers" ,\
-    "Development/Debug" ,\
-    "Development/Languages/C and C++" ,\
-    "Development/Languages/Fortran" ,\
-    "Development/Languages/Java" ,\
-    "Development/Languages/Mono" ,\
-    "Development/Languages/Other" ,\
-    "Development/Languages/Perl" ,\
-    "Development/Libraries/PHP" ,\
-    "Development/Languages/Python" ,\
-    "Development/Languages/Ruby" ,\
-    "Development/Languages/Scheme" ,\
-    "Development/Languages/Tcl" ,\
-    "Development/Libraries/C and C++" ,\
-    "Development/Libraries/Cross" ,\
-    "Development/Libraries/GNOME" ,\
-    "Development/Libraries/Java" ,\
-    "Development/Libraries/KDE" ,\
-    "Development/Libraries/Other" ,\
-    "Development/Libraries/Parallel" ,\
-    "Development/Libraries/Perl" ,\
-    "Development/Libraries/Python" ,\
-    "Development/Libraries/Tcl" ,\
-    "Development/Libraries/X11" ,\
-    "Development/Libraries/YaST" ,\
-    "Development/Sources" ,\
-    "Development/Tools/Building" ,\
-    "Development/Tools/Debuggers" ,\
-    "Development/Tools/Doc Generators" ,\
-    "Development/Tools/GUI Builders" ,\
-    "Development/Tools/IDE" ,\
-    "Development/Tools/Navigators" ,\
-    "Development/Tools/Other" ,\
-    "Development/Tools/Version Control" ,\
-    "Documentation/HTML" ,\
-    "Documentation/Howto" ,\
-    "Documentation/Man" ,\
-    "Documentation/Other" ,\
-    "Documentation/SUSE" ,\
-    "Hardware/Camera" ,\
-    "Hardware/Fax" ,\
-    "Hardware/ISDN" ,\
-    "Hardware/Joystick" ,\
-    "Hardware/Mobile" ,\
-    "Hardware/Modem" ,\
-    "Hardware/Other" ,\
-    "Hardware/Palm" ,\
-    "Hardware/Printing" ,\
-    "Hardware/Psion" ,\
-    "Hardware/Radio" ,\
-    "Hardware/Scanner" ,\
-    "Hardware/TV" ,\
-    "Hardware/UPS" ,\
-    "Hardware/Wifi" ,\
-    "Metapackages" ,\
-    "Productivity/Archiving/Backup" ,\
-    "Productivity/Archiving/Compression" ,\
-    "Productivity/Clustering/Computing" ,\
-    "Productivity/Clustering/HA" ,\
-    "Productivity/Databases/Clients" ,\
-    "Productivity/Databases/Servers" ,\
-    "Productivity/Databases/Tools" ,\
-    "Productivity/Editors/Emacs" ,\
-    "Productivity/Editors/Other" ,\
-    "Productivity/Editors/Vi" ,\
-    "Productivity/File utilities" ,\
-    "Productivity/Graphics/3D Editors" ,\
-    "Productivity/Graphics/Bitmap Editors" ,\
-    "Productivity/Graphics/CAD" ,\
-    "Productivity/Graphics/Convertors" ,\
-    "Productivity/Graphics/Other" ,\
-    "Productivity/Graphics/Vector Editors" ,\
-    "Productivity/Graphics/Viewers" ,\
-    "Productivity/Graphics/Visualization/Graph" ,\
-    "Productivity/Graphics/Visualization/Other" ,\
-    "Productivity/Graphics/Visualization/Raytracers" ,\
-    "Productivity/Hamradio/Fax" ,\
-    "Productivity/Hamradio/Logging" ,\
-    "Productivity/Hamradio/Morse" ,\
-    "Productivity/Hamradio/Other" ,\
-    "Productivity/Hamradio/Packet" ,\
-    "Productivity/Hamradio/Psk31" ,\
-    "Productivity/Hamradio/Satellite" ,\
-    "Productivity/Multimedia/CD/Grabbers" ,\
-    "Productivity/Multimedia/CD/Players" ,\
-    "Productivity/Multimedia/CD/Record" ,\
-    "Productivity/Multimedia/Other" ,\
-    "Productivity/Multimedia/Sound/Editors and Convertors" ,\
-    "Productivity/Multimedia/Sound/Midi" ,\
-    "Productivity/Multimedia/Sound/Mixers" ,\
-    "Productivity/Multimedia/Sound/Players" ,\
-    "Productivity/Multimedia/Sound/Utilities" ,\
-    "Productivity/Multimedia/Sound/Visualization" ,\
-    "Productivity/Multimedia/Video/Editors and Convertors" ,\
-    "Productivity/Multimedia/Video/Players" ,\
-    "Productivity/Networking/AOLInstantMessenger" ,\
-    "Productivity/Networking/Archie" ,\
-    "Productivity/Networking/Boot/Clients" ,\
-    "Productivity/Networking/Boot/Servers" ,\
-    "Productivity/Networking/Boot/Utilities" ,\
-    "Productivity/Networking/DNS/Servers" ,\
-    "Productivity/Networking/DNS/Utilities" ,\
-    "Productivity/Networking/Diagnostic" ,\
-    "Productivity/Networking/Email/Clients" ,\
-    "Productivity/Networking/Email/Mailinglists" ,\
-    "Productivity/Networking/Email/Servers" ,\
-    "Productivity/Networking/Email/Utilities" ,\
-    "Productivity/Networking/File-Sharing" ,\
-    "Productivity/Networking/Ftp/Clients" ,\
-    "Productivity/Networking/Ftp/Servers" ,\
-    "Productivity/Networking/ICQ" ,\
-    "Productivity/Networking/IRC" ,\
-    "Productivity/Networking/Instant Messenger" ,\
-    "Productivity/Networking/LDAP/Clients" ,\
-    "Productivity/Networking/LDAP/Servers" ,\
-    "Productivity/Networking/LDAP/Utilities" ,\
-    "Productivity/Networking/NFS" ,\
-    "Productivity/Networking/NIS" ,\
-    "Productivity/Networking/Napster" ,\
-    "Productivity/Networking/News/Clients" ,\
-    "Productivity/Networking/News/Servers" ,\
-    "Productivity/Networking/News/Utilities" ,\
-    "Productivity/Networking/Novell" ,\
-    "Productivity/Networking/Other" ,\
-    "Productivity/Networking/PPP" ,\
-    "Productivity/Networking/Radius/Clients" ,\
-    "Productivity/Networking/Radius/Servers" ,\
-    "Productivity/Networking/Routing" ,\
-    "Productivity/Networking/SSH" ,\
-    "Productivity/Networking/Samba" ,\
-    "Productivity/Networking/Security" ,\
-    "Productivity/Networking/System" ,\
-    "Productivity/Networking/Talk/Clients" ,\
-    "Productivity/Networking/Talk/Servers" ,\
-    "Productivity/Networking/Web/Browsers" ,\
-    "Productivity/Networking/Web/Frontends" ,\
-    "Productivity/Networking/Web/Proxy" ,\
-    "Productivity/Networking/Web/Servers" ,\
-    "Productivity/Networking/Web/Utilities" ,\
-    "Productivity/Office/Dictionary" ,\
-    "Productivity/Office/Finance" ,\
-    "Productivity/Office/Management" ,\
-    "Productivity/Office/Organizers" ,\
-    "Productivity/Office/Other" ,\
-    "Productivity/Office/Spreadsheets" ,\
-    "Productivity/Office/Suite" ,\
-    "Productivity/Office/Word Processor" ,\
-    "Productivity/Other" ,\
-    "Productivity/Publishing/DocBook" ,\
-    "Productivity/Publishing/HTML/Editors" ,\
-    "Productivity/Publishing/HTML/Tools" ,\
-    "Productivity/Publishing/Other" ,\
-    "Productivity/Publishing/PDF" ,\
-    "Productivity/Publishing/PS" ,\
-    "Productivity/Publishing/Presentation" ,\
-    "Productivity/Publishing/SGML" ,\
-    "Productivity/Publishing/TeX/Base" ,\
-    "Productivity/Publishing/TeX/Fonts" ,\
-    "Productivity/Publishing/TeX/Frontends" ,\
-    "Productivity/Publishing/TeX/Utilities" ,\
-    "Productivity/Publishing/Texinfo" ,\
-    "Productivity/Publishing/Troff" ,\
-    "Productivity/Publishing/Word" ,\
-    "Productivity/Publishing/XML" ,\
-    "Productivity/Scientific/Astronomy" ,\
-    "Productivity/Scientific/Chemistry" ,\
-    "Productivity/Scientific/Electronics" ,\
-    "Productivity/Scientific/Math" ,\
-    "Productivity/Scientific/Other" ,\
-    "Productivity/Scientific/Physics" ,\
-    "Productivity/Security" ,\
-    "Productivity/Telephony/Clients" ,\
-    "Productivity/Telephony/H323/Clients" ,\
-    "Productivity/Telephony/H323/Servers" ,\
-    "Productivity/Telephony/H323/Utilities" ,\
-    "Productivity/Telephony/SIP/Clients" ,\
-    "Productivity/Telephony/SIP/Servers" ,\
-    "Productivity/Telephony/SIP/Utilities" ,\
-    "Productivity/Telephony/Servers" ,\
-    "Productivity/Telephony/Utilities" ,\
-    "Productivity/Text/Convertors" ,\
-    "Productivity/Text/Editors" ,\
-    "Productivity/Text/Spell" ,\
-    "Productivity/Text/Utilities" ,\
-    "System/Base" ,\
-    "System/Benchmark" ,\
-    "System/Boot" ,\
-    "System/Console" ,\
-    "System/Daemons" ,\
-    "System/Emulators/Other" ,\
-    "System/Emulators/PC" ,\
-    "System/Fhs" ,\
-    "System/Filesystems" ,\
-    "System/GUI/GNOME" ,\
-    "System/GUI/KDE" ,\
-    "System/GUI/LXDE" ,\
-    "System/GUI/Other" ,\
-    "System/GUI/XFCE" ,\
-    "System/I18n/Chinese" ,\
-    "System/I18n/Japanese" ,\
-    "System/I18n/Korean" ,\
-    "System/Kernel" ,\
-    "System/Libraries" ,\
-    "System/Localization" ,\
-    "System/Management" ,\
-    "System/Monitoring" ,\
-    "System/Packages" ,\
-    "System/Shells" ,\
-    "System/Sound Daemons" ,\
-    "System/X11/Displaymanagers" ,\
-    "System/X11/Fonts" ,\
-    "System/X11/Icons" ,\
-    "System/X11/Servers/XF86_3" ,\
-    "System/X11/Servers/XF86_4" ,\
-    "System/X11/Terminals" ,\
-    "System/X11/Utilities" ,\
-    "System/YaST" ,\
-))
--- a/rpmlint-checks-master.tar.gz
+++ b/rpmlint-checks-master.tar.gz
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:942cade77ce21a067635f0ab7e1587b1aba9b2489bfab0ea411ac63c6ae55491
-size 30924
+oid sha256:e6bb7a128adc749d02b44a64b8a21d57c3dbd0644c550fac698e86e9fb836f69
+size 30589
--- a/rpmlint.changes
+++ b/rpmlint.changes
@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Sep 25 10:59:27 UTC 2013 - meissner@suse.com
+
+- whitelist second iteration of wicked dbus service names
+  (bnc#783932)
+
+-------------------------------------------------------------------
+Mon Sep 23 14:19:05 UTC 2013 - dmueller@suse.com
+
+- blacklist old systemd/udev directories (bnc#816467) 
+- remove checking for groups (bnc#767551)
+- ignore icon size mismatches on animated icons (bnc#480664)
+- update obsolete/invalid suse version check
+
 -------------------------------------------------------------------
 Tue Sep 17 10:03:53 UTC 2013 - abergmann@suse.com

--- a/rpmlint.spec
+++ b/rpmlint.spec
@ -31,7 +31,6 @@ Source0:        https://downloads.sourceforge.net/project/rpmlint/rpmlint-%{vers
 Source1:        rpmlint-checks-master.tar.gz
 Source2:        config
 Source3:        config.in
-Source10:       rpmgroups.config
 Source11:       pie.config
 Source12:       licenses.config
 Source100:      syntax-validator.py
@ -220,7 +219,6 @@ mv $RPM_BUILD_ROOT/etc/rpmlint/config $RPM_BUILD_ROOT/usr/share/rpmlint/config
 head -n 8 $RPM_BUILD_ROOT/usr/share/rpmlint/config > $RPM_BUILD_ROOT/etc/rpmlint/config
 # make sure that the package is sane
 python -tt %{SOURCE100} $RPM_BUILD_ROOT/usr/share/rpmlint/*.py $RPM_BUILD_ROOT/usr/share/rpmlint/config
-%__install -m 644 %{SOURCE10} %{buildroot}/%{_sysconfdir}/rpmlint/
 %__install -m 644 %{SOURCE11} %{buildroot}/%{_sysconfdir}/rpmlint/

 cp %{SOURCE12} licenses.config
@ -239,7 +237,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/bin/*
 %{_prefix}/share/rpmlint
 %config(noreplace) /etc/rpmlint/config
-%config %{_sysconfdir}/rpmlint/rpmgroups.config
 %config %{_sysconfdir}/rpmlint/pie.config
 %config %{_sysconfdir}/rpmlint/licenses.config
 %dir /etc/rpmlint
--- a/suse-version.diff
+++ b/suse-version.diff
@ -15,9 +15,9 @@ Index: SpecCheck.py
                         printWarning(pkg, 'hardcoded-prefix-tag', res.group(1))
 
 +                res = suse_version_regex.search(line)
-+                if res and int(res.group(1)) > 0 and int(res.group(1)) < 1130:
+                if res and int(res.group(1)) > 0 and int(res.group(1)) < 1210:
 +                    printWarning(pkg, "obsolete-suse-version-check", res.group(1))
-+                elif res and int(res.group(1)) > 1230:
+                elif res and int(res.group(1)) > 1310:
 +                    printError(pkg, "invalid-suse-version-check", res.group(1))
 +
                 res = prereq_regex.search(line)