From 2e32993cab12baf469145a1a9a983ac0b220649c Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 18 Aug 2007 20:32:59 +0000 Subject: [PATCH] rpmdist.mk: Pass RPM_REQUIRES_(RUN|DEVEL) to mkspec.sh - Pass RPM_REQUIRES_(RUN|DEVEL) to mkspec.sh - Beautify logging - Remove rpminstall.dist after uninstall --- make/rpmdist.mk | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index ba88fc99..036a9202 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -84,8 +84,8 @@ cpmod.dist: cpfiles.dist: mkdir -p $(DIST_SRC_DIR) cp $(wildcard Makefile configure.ac.tmpl) $(DIST_SRC_DIR) - sh $(MKSPEC_SH) -V $(RPM_VERSION) -S $(notdir $(PCKG_TAR)) -N $(RPM_PROJECT) -R "$(RPM_REQUIRED)" \ - -P $(PROJECT) \ + sh $(MKSPEC_SH) -V $(RPM_VERSION) -S $(notdir $(PCKG_TAR)) -N $(RPM_PROJECT) \ + -R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" -P $(PROJECT) \ > $(DIST_SRC_DIR)/$(RPM_PROJECT)-$(RPM_VERSION).spec echo $(RPM_VERSION) > $(DIST_SRC_DIR)/VERSION touch $@ @@ -109,20 +109,22 @@ $(DIST_PCKG_DIR)/CURRENT_%: $(TOPDIR)/VERSION build.dist: $(DIST_FILES) rpminstall.dist: $(DIST_PCKG_RPM) - for p in $^; do \ + @set -e; for p in $^; do \ if ! /bin/rpm -q `basename $$p | sed "s/\.$(RPM_ARCH)\.rpm//"` > /dev/null 2>&1 ; then \ - echo installing $$p ;\ + echo + installing $$p ;\ sudo /bin/rpm -U $$p; \ fi; \ done touch $@ rpmuninstall.dist: - for s in devel run; do \ + @set -e; for s in devel run; do \ if /bin/rpm -q $(RPM_PROJECT)-$$s > /dev/null 2>&1 ; then \ + echo + removing $(RPM_PROJECT)-$$s ;\ sudo /bin/rpm -e $(RPM_PROJECT)-$$s --nodeps; \ fi; \ done + rm -f rpminstall.dist upload-%.dist: %_$(PROJECT_CAPNAME)_RPM_RUN_I386 cvs commit $<