From 1bbb749072274bd983b8b9751be011cff940d10639ddb2972ba2b4ad85b5deb8 Mon Sep 17 00:00:00 2001
From: Ruediger Oertel <ro@suse.de>
Date: Thu, 18 Nov 2010 13:55:26 +0000
Subject: [PATCH] Accepting request 53332 from Base:System

Accepted submit request 53332 from user elvigia

OBS-URL: https://build.opensuse.org/request/show/53332
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=109
---
 brp.diff        |  2 +-
 rpm-suse_macros | 28 ++++++++++------------------
 rpm.changes     | 16 ++++++++++++++++
 rpm.spec        |  1 +
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/brp.diff b/brp.diff
index 3f7a341..8eaf776 100644
--- a/brp.diff
+++ b/brp.diff
@@ -276,7 +276,7 @@ Index: scripts/Makefile.am
  	check-files check-prereqs \
  	check-buildroot check-rpaths check-rpaths-worker \
  	find-debuginfo.sh find-lang.sh \
-@@ -23,8 +25,10 @@ EXTRA_DIST = \
+@@ -24,8 +26,10 @@ EXTRA_DIST = \
  
  rpmconfig_SCRIPTS = \
  	brp-compress brp-python-bytecompile brp-java-gcjcompile \
diff --git a/rpm-suse_macros b/rpm-suse_macros
index cb75541..ab14b81 100644
--- a/rpm-suse_macros
+++ b/rpm-suse_macros
@@ -1,10 +1,5 @@
-%suse_check \
-        %{?buildroot:RPM_BUILD_ROOT=\"%{buildroot}\"\
-        export RPM_BUILD_ROOT}\
-        test -x /usr/sbin/Check -a $UID = 0 -o -x /usr/sbin/Check -a ! -z "$RPM_BUILD_ROOT" && {\
-            echo "I call /usr/sbin/Check..."\
-            /usr/sbin/Check\
-        }
+# need to keep this around for a while
+%suse_check             %{nil}
 
 # directories
 %_infodir               %{_prefix}/share/info
@@ -23,8 +18,8 @@
 %suseconfig_fonts_prereq          perl aaa_base
 %install_info_prereq    info
 
+# _suse_os_install_post is defined in brp-checks-suse
 %__os_install_post    %{?_suse_os_install_post}%{!?_suse_os_install_post: \
-    %{suse_check} \
     /usr/lib/rpm/brp-compress \
     /usr/lib/rpm/brp-symlink  \
 %{nil}}
@@ -85,6 +80,7 @@
 
 %is_plus %(if test -f /.buildenv ; then source /.buildenv ; if [[ "$BUILD_BASENAME" == *+kde ]] ; then echo 1 ; else echo 0 ; fi ; else echo 0 ; fi)
 
+# deprecated, use %set_permissions instead
 %run_permissions() \
 	if test "$YAST_IS_RUNNING" != "instsys" ; then \
 	    if test -x /sbin/SuSEconfig -a -f /sbin/conf.d/SuSEconfig.permissions ; then \
@@ -123,18 +119,14 @@
   fi \
   %nil
 
+%set_permissions(f:) \
+  if [ -x /usr/bin/chkstat ]; then \
+    /usr/bin/chkstat -n --set --system %{**} \
+  fi \
+  %nil
 
 %verify_permissions(e:f:) \
-   if test -f /etc/sysconfig/security ; then \
-      source /etc/sysconfig/security \
-   fi \
-   PERMFILES="/etc/permissions" \
-   for PERMEXT in $PERMISSION_SECURITY ; do \
-     if test -f /etc/permissions.$PERMEXT ; then \
-       PERMFILES="$PERMFILES /etc/permissions.$PERMEXT" \
-     fi \
-   done \
-   /usr/bin/chkstat -n %{**} $PERMFILES 1>&2 \
+   /usr/bin/chkstat -n --warn --system %{**} 1>&2 \
    %nil
 
 # %{suse_update_config [-fcl] [dirs...]}
diff --git a/rpm.changes b/rpm.changes
index 2d32185..335c374 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Nov 16 15:25:45 UTC 2010 - lnussel@suse.de
+
+- fix %verify_permissions to actually only warn
+- introduce %set_permissions to replace %run_permissions in the future
+
+-------------------------------------------------------------------
+Tue Nov  9 15:07:52 UTC 2010 - lnussel@suse.de
+
+- don't call /usr/bin/Check at all anymore. superfluous
+
+-------------------------------------------------------------------
+Tue Nov  9 13:04:21 UTC 2010 - lnussel@suse.de
+
+- change %verify_permissions to use new system mode of chkstat
+
 -------------------------------------------------------------------
 Fri Oct 29 15:03:50 CEST 2010 - mls@suse.de
 
diff --git a/rpm.spec b/rpm.spec
index f0f3c32..f9d00f0 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -300,6 +300,7 @@ fi
 
 %postun
 %{insserv_cleanup}
+
 %verifyscript
 %verify_permissions -f /usr/lib/rpm/permlist