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

rpmdist.mk: Add new targets rpm-install + rpm-uninstall

Browse source 
- Add targets rpm-install rpm-uninstall
  - Now update repository on rpm-release
  - Remove misplaced autoconf stuff
This commit is contained in:
Jan Lindemann 2007-08-16 18:05:20 +00:00 • committed by Jan Lindemann
commit 996acdd244
1 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

25
make/rpmdist.mk
View file

@ -54,9 +54,10 @@ ftag: ftag.dist
rpm-upload-stable: rpm-upload-STABLE.dist rpm-upload-stable: rpm-upload-STABLE.dist
rpm-upload-rc: rpm-upload-RC.dist rpm-upload-rc: rpm-upload-RC.dist
rpm-release: upload.dist rpm-release: update-repo.dist
rpm-clean: clean.rpm rpm-clean: clean.rpm
rpm-uninstall: rpmuninstall.dist
rpm-install: rpminstall.dist
clean.rpm: clean.rpm:
rm -rf $(DIST_SRC_DIR) $(PCKG_TAR) *.dist rm -rf $(DIST_SRC_DIR) $(PCKG_TAR) *.dist
@ -81,8 +82,7 @@ cpmod.dist:
cpfiles.dist: cpfiles.dist:
mkdir -p $(DIST_SRC_DIR) mkdir -p $(DIST_SRC_DIR)
cp Makefile $(DIST_SRC_DIR) cp $(wildcard Makefile configure.ac.tmpl) $(DIST_SRC_DIR)
cp 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) -R "$(RPM_REQUIRED)" \
-P $(PROJECT) \ -P $(PROJECT) \
> $(DIST_SRC_DIR)/$(RPM_PROJECT)-$(RPM_VERSION).spec > $(DIST_SRC_DIR)/$(RPM_PROJECT)-$(RPM_VERSION).spec
@ -108,11 +108,26 @@ $(DIST_PCKG_DIR)/CURRENT_%: $(TOPDIR)/VERSION
build.dist: $(DIST_FILES) build.dist: $(DIST_FILES)
rpminstall.dist: $(DIST_PCKG_RPM) rpminstall.dist: $(DIST_PCKG_RPM)
sudo /bin/rpm -U $< for p in $^; do \
if ! /bin/rpm -q `basename $$p | sed "s/\.$(RPM_ARCH)\.rpm//"` > /dev/null 2>&1 ; then \
echo installing $$p ;\
sudo /bin/rpm -U $$p; \
fi; \
done
touch $@ touch $@
rpmuninstall.dist: $(DIST_PCKG_RPM)
for s in devel run; do \
if /bin/rpm -q $(RPM_PROJECT)-$$s > /dev/null 2>&1 ; then \
sudo /bin/rpm -e $(RPM_PROJECT)-$$s --nodeps; \
fi; \
done
upload-%.dist: %_$(PROJECT_CAPNAME)_RPM_RUN_I386 upload-%.dist: %_$(PROJECT_CAPNAME)_RPM_RUN_I386
cvs commit $< cvs commit $<
$(UPLOAD_SH) $< $(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/$<:640:750:$(FTP_RUN_USER).$(FTP_RUN_GROUP) $(UPLOAD_SH) $< $(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/$<:640:750:$(FTP_RUN_USER).$(FTP_RUN_GROUP)
touch $@ touch $@
update-repo.dist: upload.dist
ssh -l root $(FTP_HOST) /etc/cron.hourly/create_packet_descriptions.sh
touch $@