diff --git a/config b/config index 1f7c2b5..ac4d444 100644 --- a/config +++ b/config @@ -100,6 +100,8 @@ setOption('StandardGroups', ( 'hsqldb', 'icecast', 'icecream', + 'icinga', + 'icingacmd', 'ifdrwww', 'intermezzo', 'jboss', @@ -231,6 +233,7 @@ setOption('StandardUsers', ( 'hsqldb', 'icecast', 'icecream', + 'icinga', 'intermezzo', 'irc', 'jabber', diff --git a/rpmlint.changes b/rpmlint.changes index 5a9bddc..bd18e63 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Aug 3 17:22:43 UTC 2012 - thardeck@suse.com + +- added icinga users and groups + +------------------------------------------------------------------- +Thu Jul 5 12:21:08 UTC 2012 - dmueller@suse.com + +- remove python naming check (bnc#768247) + ------------------------------------------------------------------- Tue Jun 26 13:54:35 UTC 2012 - lnussel@suse.de diff --git a/rpmlint.spec b/rpmlint.spec index 9eeb7aa..49f2b4e 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -74,8 +74,7 @@ Patch1: suse-checks.diff Patch2: suse-version.diff Patch3: suse-url-check.diff Patch4: invalid-filerequires.diff -# disable -#Patch5: suse-bzip-bigger-than-100k.diff +Patch5: suse-python3-naming-policy.diff Patch6: suse-filesystem.diff Patch7: suse-pkg-config-check.diff Patch8: suse-binarieschecks.diff @@ -155,7 +154,7 @@ Authors: %patch2 %patch3 %patch4 -#patch5 +%patch5 %patch6 %patch7 %patch8 diff --git a/suse-python3-naming-policy.diff b/suse-python3-naming-policy.diff new file mode 100644 index 0000000..7ca8b37 --- /dev/null +++ b/suse-python3-naming-policy.diff @@ -0,0 +1,11 @@ +--- NamingPolicyCheck.py ++++ NamingPolicyCheck.py +@@ -91,7 +91,7 @@ + + + check.add_check('xmms', '^xmms(-|$)', '^/usr/lib(64)?/xmms/') +-check.add_check('python', '^python(-|$)', '^/usr/lib(64)?/python[1-9](-[1-9])?') ++#check.add_check('python', '^python(2|3)?(-|$)', '^/usr/lib(64)?/python[1-9](-[1-9])?') + check.add_check('perl5', '^perl(-|$)', '^/usr/lib(64)?/perl5/vendor_perl') + check.add_check('apache2', '^apache2-mod_', '^/usr/lib(64)?/apache2-') + check.add_check('fortune', '^fortune(-|$)', '^/usr/share/games/fortunes/')