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..eea1306 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}} @@ -125,16 +120,7 @@ %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 --system %{**} 1>&2 \ %nil # %{suse_update_config [-fcl] [dirs...]} diff --git a/rpm.changes b/rpm.changes index 2d32185..77c0ee2 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +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