From 7f21de15fa24e29c588796ac8952f3098273ed7e Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Thu, 2 Aug 2012 10:39:33 +0000
Subject: drop very old rpmbuild aliases on rpm which warns about being
 deprecated for quite a long time

---
 Makefile.am     |  7 -------
 NEWS            |  3 +++
 rpmb_deprecated |  3 ---
 rpmpopt         | 24 ------------------------
 4 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 rpmb_deprecated
 delete mode 100644 rpmpopt

diff --git a/Makefile.am b/Makefile.am
index 9ca9772..a57e7b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,6 @@
 
 arch_macrosfiles = $(RPMALLARCH:=.macros)
 
-pkg_data = \
-		   rpmpopt
-
 pkg_gdata = \
 		   macros \
 		   rpmrc
@@ -73,7 +70,6 @@ g_ir_extract_deps_SOURCES = g-ir-extract-deps.c
 noinst_DATA = $(pkg_gconfig)
 
 foobar_pkglib_DATA = \
-	$(pkg_data) \
 	$(pkg_gdata)
 	$(pkg_gconfig)
 
@@ -82,7 +78,6 @@ foobar_pkglib_SCRIPTS = \
 	$(pkg_gscripts)
 
 EXTRA_DIST = \
-	$(pkg_data) \
 	$(pkg_data_in) \
 	$(pkg_sysconf_macros_in) \
 	$(pkg_scripts) \
@@ -90,7 +85,6 @@ EXTRA_DIST = \
 	macros-perarch.in make_arch_macrosfiles.sh.in \
 	rpmgenplatform.in rpmrc.in \
 	rpm-spec-mode.el \
-	rpmb_deprecated \
 	tests.sh tests/macros.sh \
 	tests/findlang.pl tests/findlang.sh
 
@@ -129,7 +123,6 @@ else
 	done
 endif
 	[ -d $(DESTDIR)$(RPMSYSCONFDIR)/macros.d ] || $(mkinstalldirs) $(DESTDIR)$(RPMSYSCONFDIR)/macros.d
-	$(install_sh_SCRIPT) rpmb_deprecated $(DESTDIR)$(RPMLIBDIR)
 	for i in $(pkg_sysconf_macros); do \
 		$(install_sh_DATA) $${i} $(DESTDIR)$(RPMSYSCONFDIR)/macros.d/$${i}; \
 	done
diff --git a/NEWS b/NEWS
index 1b8fd04..0144595 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- drop very old rpmbuild aliases on rpm which warns about being deprecated for
+  quite a long time
+
 Version 1.154 - 31 Jul 2012, by Thierry Vignaud
 - drop unused brp-compress (obsoleted by spec-helper 4 years ago)
 - use upstream find-debuginfo.sh as we merged our changes back into rpm package
diff --git a/rpmb_deprecated b/rpmb_deprecated
deleted file mode 100644
index b38aa06..0000000
--- a/rpmb_deprecated
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-echo '"rpm -b" is deprecated, use "rpmbuild -b"' 1>&2
-exec rpmbuild "$@"
diff --git a/rpmpopt b/rpmpopt
deleted file mode 100644
index f1c1c47..0000000
--- a/rpmpopt
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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
-- 
cgit v1.2.1