diff --git a/rpm-suse_macros b/rpm-suse_macros index cb9a461..1f3961a 100644 --- a/rpm-suse_macros +++ b/rpm-suse_macros @@ -13,7 +13,6 @@ %makeinstall make DESTDIR=%{?buildroot:%{buildroot}} install %insserv_prereq insserv sed %fillup_prereq fillup coreutils grep diffutils -%suseconfig_fonts_prereq perl aaa_base %install_info_prereq info # this script calls all scripts in /usr/lib/rpm/brp-suse.d @@ -69,24 +68,15 @@ # deprecated, use %set_permissions instead %run_permissions() \ + echo "WARNING: run_permissions is obsolete and will be removed january 2013" + echo "use set_permissions (available since 11.4) with a file argument" if test "$YAST_IS_RUNNING" != "instsys" ; then \ - if test -x /sbin/SuSEconfig -a -f /sbin/conf.d/SuSEconfig.permissions ; then \ - /sbin/SuSEconfig --module permissions \ + if [ -x /usr/bin/chkstat ]; then \ + /usr/bin/chkstat -n --set --system \ fi \ fi \ %nil -%run_suseconfig(m:) \ - %{!-m:echo -e "\\nERROR: missing parameter for macro run_suseconfig\\n" ; exit 1 ; } \ - if test "$YAST_IS_RUNNING" != "instsys" ; then \ - if test -x /sbin/SuSEconfig -a -f /sbin/conf.d/SuSEconfig.%{-m*} ; then \ - /sbin/SuSEconfig --module %{-m*} \ - else \ - echo -e "\\nWARNING: SuSEconfig or requested SuSEconfig module not present!\\n" ; \ - fi \ - fi \ - %nil - %set_permissions(f:) \ if [ -x /usr/bin/chkstat ]; then \ /usr/bin/chkstat -n --set --system %{**} \ @@ -97,11 +87,15 @@ /usr/bin/chkstat -n --warn --system %{**} 1>&2 \ %nil +%run_suseconfig(m:) \ + %{!-m:echo -e "\\nERROR: missing parameter for macro run_suseconfig\\n" ; exit 1 ; } \ + echo "WARNING: run_suseconfig is obsolete (as is SUSEconfig) and the macro will be removed in january 2013" \ + echo "It will be a nop as SUSEconfig is gone" \ + %nil + # %{suse_update_config [-fcl] [dirs...]} %suse_update_config(fcl) \ - echo 'WARNING: REMOVE %%suse_update_config. If your sources are really' \ - echo 'too old to cover current architectures, prefer autoreconf --force --install' \ - autoreconf --force --install \ + echo 'WARNING: REMOVE %%suse_update_config. The macro will be removed in january 2013' \ %nil %suse_update_libdir() \ @@ -287,7 +281,7 @@ %supplements_kernel_module() \ %{expand:%(if ! rpm -q kernel-syms > /dev/null; then echo "%fail Please add the kernel-syms package to BuildRequires"; fi)} -%suse_version 1220 +%suse_version 1230 %sles_version 0 %ul_version 0 diff --git a/rpm.changes b/rpm.changes index 26b07b0..8a504fe 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Sep 24 11:43:13 UTC 2012 - coolo@suse.com + +- put an end date as echo into + %run_permissions + %run_suseconfig + %suse_update_config + ------------------------------------------------------------------- Mon Sep 17 10:12:03 UTC 2012 - coolo@suse.com