diff --git a/rpm-suse_macros b/rpm-suse_macros index 1f3961a..5122975 100644 --- a/rpm-suse_macros +++ b/rpm-suse_macros @@ -66,17 +66,6 @@ %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() \ - 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 [ -x /usr/bin/chkstat ]; then \ - /usr/bin/chkstat -n --set --system \ - fi \ - fi \ - %nil - %set_permissions(f:) \ if [ -x /usr/bin/chkstat ]; then \ /usr/bin/chkstat -n --set --system %{**} \ @@ -87,17 +76,6 @@ /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. The macro will be removed in january 2013' \ - %nil - %suse_update_libdir() \ if [ %_lib != lib ]; then \ for file in %{?*} ; do \ diff --git a/rpm.changes b/rpm.changes index 235d1cb..1e9ccc0 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jan 10 12:04:15 UTC 2013 - coolo@suse.com + +- remove the macros that were documented to be removed january 2013: + %run_permissions, use %set_permissions instead + %run_suseconfig, SuSEconfig is gone + %suse_update_config + ------------------------------------------------------------------- Wed Jan 2 13:46:17 UTC 2013 - dmueller@suse.com diff --git a/rpm.spec b/rpm.spec index bd53926..238337e 100644 --- a/rpm.spec +++ b/rpm.spec @@ -148,6 +148,7 @@ all installed packages. RPM also supports database queries. %package devel Summary: Include Files and Libraries mandatory for Development +Group: System/Packages Requires: rpm = %{version} # for people confusing the one with the other Recommends: rpm-build = %{version} @@ -162,6 +163,7 @@ need an intimate knowledge of RPM packages in order to function. %package build Summary: Tools and Scripts to create rpm packages +Group: System/Packages Requires: rpm = %{version} Provides: rpm:%_bindir/rpmbuild Provides: rpmbuild