aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2011-02-05 20:21:58 +0000
committerThomas Backlund <tmb@mageia.org>2011-02-05 20:21:58 +0000
commita92e9310c112bdc983a18466492f18a002db2b50 (patch)
tree2fbb269db1075d62fb3064dc482b76112f1982ac
parentacffc72f16c13a81f622f9353a5da40a35ebb5ee (diff)
downloadrpm-setup-a92e9310c112bdc983a18466492f18a002db2b50.tar
rpm-setup-a92e9310c112bdc983a18466492f18a002db2b50.tar.gz
rpm-setup-a92e9310c112bdc983a18466492f18a002db2b50.tar.bz2
rpm-setup-a92e9310c112bdc983a18466492f18a002db2b50.tar.xz
rpm-setup-a92e9310c112bdc983a18466492f18a002db2b50.zip
merge rpm -b deprecated warning scripts from rpm-manbo-setup
-rw-r--r--Makefile.am2
-rw-r--r--NEWS1
-rw-r--r--rpmb_deprecated3
-rw-r--r--rpmpopt24
4 files changed, 30 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index ff71923..75e0a7b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,6 +47,8 @@ pkg_scripts = \
php.req \
pkgconfigdeps.sh \
pythoneggs.py \
+ rpmb_deprecated \
+ rpmpopt \
rubygems.rb
pkg_gscripts = \
diff --git a/NEWS b/NEWS
index c84a799..48fb0de 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Version 1.116 - 5 February 2011, by Thomas Backlund
- merge manbo.macros from rpm-manbo-setup
- merge manbo-build.macros from rpm-manbo-setup
- merge under/overlinking scripts from rpm-manbo-setup
+- merge rpm -b depreceated warning scripts from rpm-manbo-setup
Version 1.115 - 9 January 2011, by Oliver Blin
- initial Mageia import
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
new file mode 100644
index 0000000..f1c1c47
--- /dev/null
+++ b/rpmpopt
@@ -0,0 +1,24 @@
+# mageia rpmpopt
+# $Id: rpmpopt 167053 2008-02-13 15:29:05Z pixel $
+
+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