From 3611f2df8a449d03c626f3b5e80cceadc461966b Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 23 Jan 2008 13:57:55 +0000 Subject: 1.70: deprecate "rpm -b" in favor of "rpmbuild -b" --- Makefile.am | 1 + configure.ac | 2 +- rpmb_deprecated | 3 +++ rpmpopt | 42 +++++++++++++++++++++--------------------- 4 files changed, 26 insertions(+), 22 deletions(-) create mode 100644 rpmb_deprecated diff --git a/Makefile.am b/Makefile.am index b4352c1..b837369 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,6 +69,7 @@ EXTRA_DIST = \ macros-perarch.in make_macrosfiles.sh.in \ rpmgenplatform.in \ rpm-spec-mode.el \ + rpmb_deprecated \ tests.sh tests/macros.sh \ tests/findlang.pl tests/findlang.sh diff --git a/configure.ac b/configure.ac index f0e215a..e2238b9 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # $Id$ AC_PREREQ(2.59) -AC_INIT(rpm-mandriva-setup, 1.69, nanardon@mandriva.org) +AC_INIT(rpm-mandriva-setup, 1.70, nanardon@mandriva.org) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.9) AC_CONFIG_SRCDIR diff --git a/rpmb_deprecated b/rpmb_deprecated new file mode 100644 index 0000000..b38aa06 --- /dev/null +++ b/rpmb_deprecated @@ -0,0 +1,3 @@ +#!/bin/sh +echo '"rpm -b" is deprecated, use "rpmbuild -b"' 1>&2 +exec rpmbuild "$@" diff --git a/rpmpopt b/rpmpopt index 104c4db..10fb863 100644 --- a/rpmpopt +++ b/rpmpopt @@ -1,27 +1,27 @@ # mandriva rpmpopt # $Id$ -rpm exec --bp rpmb -bp -rpm exec --bc rpmb -bc -rpm exec --bi rpmb -bi -rpm exec --bl rpmb -bl -rpm exec --ba rpmb -ba -rpm exec --bb rpmb -bb -rpm exec --bs rpmb -bs -rpm exec --tp rpmb -tp -rpm exec --tc rpmb -tc -rpm exec --ti rpmb -ti -rpm exec --tl rpmb -tl -rpm exec --ta rpmb -ta -rpm exec --tb rpmb -tb -rpm exec --ts rpmb -ts -rpm exec --rebuild rpmb --rebuild -rpm exec --recompile rpmb --recompile -rpm exec --clean rpmb --clean -rpm exec --rmsource rpmb --rmsource -rpm exec --rmspec rpmb --rmspec -rpm exec --target rpmb --target -rpm exec --short-circuit rpmb --short-circuit +rpm exec --bp rpmb_deprecated -bp +rpm exec --bc rpmb_deprecated -bc +rpm exec --bi rpmb_deprecated -bi +rpm exec --bl rpmb_deprecated -bl +rpm exec --ba rpmb_deprecated -ba +rpm exec --bb rpmb_deprecated -bb +rpm exec --bs rpmb_deprecated -bs +rpm exec --tp rpmb_deprecated -tp +rpm exec --tc rpmb_deprecated -tc +rpm exec --ti rpmb_deprecated -ti +rpm exec --tl rpmb_deprecated -tl +rpm exec --ta rpmb_deprecated -ta +rpm exec --tb rpmb_deprecated -tb +rpm exec --ts rpmb_deprecated -ts +rpm exec --rebuild rpmb_deprecated --rebuild +rpm exec --recompile rpmb_deprecated --recompile +rpm exec --clean rpmb_deprecated --clean +rpm exec --rmsource rpmb_deprecated --rmsource +rpm exec --rmspec rpmb_deprecated --rmspec +rpm exec --target rpmb_deprecated --target +rpm exec --short-circuit rpmb_deprecated --short-circuit rpm alias --scripts --qf '\ %|PREIN?{preinstall scriptlet\ -- cgit v1.2.1