janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-25 15:03:55 +01:00
Code Activity

rpmdist.mk: Pass RPM_REQUIRES_(RUN|DEVEL) to mkspec.sh

Browse source 
- Pass RPM_REQUIRES_(RUN|DEVEL) to mkspec.sh
  - Beautify logging
  - Remove rpminstall.dist after uninstall
This commit is contained in:
Jan Lindemann 2007-08-18 20:32:59 +00:00 • committed by Jan Lindemann
commit 2e32993cab
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
make/rpmdist.mk
View file

@ -84,8 +84,8 @@ cpmod.dist:
cpfiles.dist: cpfiles.dist:
mkdir -p $(DIST_SRC_DIR) mkdir -p $(DIST_SRC_DIR)
cp $(wildcard Makefile configure.ac.tmpl) $(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)" \ sh $(MKSPEC_SH) -V $(RPM_VERSION) -S $(notdir $(PCKG_TAR)) -N $(RPM_PROJECT) \
-P $(PROJECT) \ -R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" -P $(PROJECT) \
> $(DIST_SRC_DIR)/$(RPM_PROJECT)-$(RPM_VERSION).spec > $(DIST_SRC_DIR)/$(RPM_PROJECT)-$(RPM_VERSION).spec
echo $(RPM_VERSION) > $(DIST_SRC_DIR)/VERSION echo $(RPM_VERSION) > $(DIST_SRC_DIR)/VERSION
touch $@ touch $@
@ -109,20 +109,22 @@ $(DIST_PCKG_DIR)/CURRENT_%: $(TOPDIR)/VERSION
build.dist: $(DIST_FILES) build.dist: $(DIST_FILES)
rpminstall.dist: $(DIST_PCKG_RPM) 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 \ 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; \ sudo /bin/rpm -U $$p; \
fi; \ fi; \
done done
touch $@ touch $@
rpmuninstall.dist: 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 \ 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; \ sudo /bin/rpm -e $(RPM_PROJECT)-$$s --nodeps; \
fi; \ fi; \
done done
rm -f rpminstall.dist
upload-%.dist: %_$(PROJECT_CAPNAME)_RPM_RUN_I386 upload-%.dist: %_$(PROJECT_CAPNAME)_RPM_RUN_I386
cvs commit $< cvs commit $<