diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-02-14 15:30:08 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-02-14 15:30:08 +0000 |
| commit | f654553f49d433d54f098f0a15a9db66da4660b7 (patch) | |
| tree | 30d7fa366f6d7b8c8b20a92a29b1251070cbf465 | |
| parent | a92678e9a77fdb71a96f20b75ddc8b9c0bf1177f (diff) | |
| download | rpm-setup-f654553f49d433d54f098f0a15a9db66da4660b7.tar rpm-setup-f654553f49d433d54f098f0a15a9db66da4660b7.tar.gz rpm-setup-f654553f49d433d54f098f0a15a9db66da4660b7.tar.bz2 rpm-setup-f654553f49d433d54f098f0a15a9db66da4660b7.tar.xz rpm-setup-f654553f49d433d54f098f0a15a9db66da4660b7.zip | |
1.73: rpmpopt, rpmb_deprecated and rpmrc are now in rpm-manbo-setup1.73
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | rpmb_deprecated | 3 | ||||
| -rw-r--r-- | rpmpopt | 24 |
4 files changed, 5 insertions, 36 deletions
diff --git a/Makefile.am b/Makefile.am index 364c5bb..8f43654 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,11 +2,9 @@ arch_macrosfiles = $(RPMALLARCH:=.macros) -pkg_data = \ - rpmpopt +pkg_data = pkg_gdata = \ - rpmrc \ macros pkg_sysconf_macros_tmp = \ @@ -75,9 +73,8 @@ EXTRA_DIST = \ $(pkg_scripts) \ $(pkg_scripts_in) \ macros-perarch.in make_arch_macrosfiles.sh.in \ - rpmgenplatform.in \ + rpmgenplatform.in rpmrc.in \ rpm-spec-mode.el \ - rpmb_deprecated \ tests.sh tests/macros.sh \ tests/findlang.pl tests/findlang.sh @@ -94,7 +91,7 @@ edit = sed \ %: %.in Makefile $(edit) $< > $@ -$(arch_macrosfiles): macros-perarch make_arch_macrosfiles.sh +$(arch_macrosfiles): rpmrc macros-perarch make_arch_macrosfiles.sh arch=`echo $@ | sed 's,\\.macros,,'`; \ sh ./make_arch_macrosfiles.sh macros-perarch $$arch > $@ @@ -114,7 +111,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 @@ -135,5 +131,5 @@ test: $(pkg_gdata) $(pkg_gscripts) $(arch_macrosfiles) $(pkg_gconfig) sh tests.sh CLEANFILES = $(pkg_gdata) $(pkg_gscripts) $(arch_macrosfiles) $(pkg_gconfig)\ - macros-perarch $(pkg_sysconf_macros_tmp) \ + rpmrc macros-perarch $(pkg_sysconf_macros_tmp) \ make_arch_macrosfiles.sh diff --git a/configure.ac b/configure.ac index ac76950..5dbae87 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # $Id$ AC_PREREQ(2.59) -AC_INIT(rpm-mandriva-setup, 1.72, nanardon@mandriva.org) +AC_INIT(rpm-mandriva-setup, 1.73, nanardon@mandriva.org) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.9) AC_CONFIG_SRCDIR 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 16862d0..0000000 --- a/rpmpopt +++ /dev/null @@ -1,24 +0,0 @@ -# mandriva rpmpopt -# $Id$ - -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 |