janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-26 07:13:55 +01:00
Code Activity

rpmdist.mk: Follow rpmbuild replacing rpm

Browse source 
- Fix
    - Rpmbuild instead of rpm
    - Tar option order

  - Prefixed most targets by rpm-, to provide for later extension to
    other targets
This commit is contained in:
Jan Lindemann 2007-08-14 12:48:42 +00:00 • committed by Jan Lindemann
commit 390e920e85
1 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
make/rpmdist.mk
View file

@ -18,6 +18,7 @@ FTP_HOST ?= ftp.jannet.de
FTP_HOST_LOGIN ?= root FTP_HOST_LOGIN ?= root
RPM_PROJECT ?= $(PROJECT) RPM_PROJECT ?= $(PROJECT)
RPM_VERSION ?= $(VERSION) RPM_VERSION ?= $(VERSION)
RPMBUILD ?= rpmbuild
include $(MODDIR)/make/tag-defs.mk include $(MODDIR)/make/tag-defs.mk
@ -44,15 +45,19 @@ include $(MODDIR)/make/tag-rules.mk
include $(MODDIR)/make/upload-rules.mk include $(MODDIR)/make/upload-rules.mk
all: all:
upload_stable: upload_STABLE.dist install:
upload_rc: upload_RC.dist clean: rpm-clean
tgz: $(PCKG_TAR) distclean: rpm-clean
distclean: rpmclean
clean: rpmclean
ftag: ftag.dist
rpmrelease: upload.dist
rpmclean: tgz: $(PCKG_TAR)
ftag: ftag.dist
rpm-upload-stable: rpm-upload-STABLE.dist
rpm-upload-rc: rpm-upload-RC.dist
rpm-release: upload.dist
rpm-clean: clean.rpm
clean.rpm:
rm -rf $(DIST_SRC_DIR) $(PCKG_TAR) *.dist rm -rf $(DIST_SRC_DIR) $(PCKG_TAR) *.dist
cpmod.dist: cpmod.dist:
@ -86,15 +91,15 @@ cpfiles.dist:
%.tar.gz: cpfiles.dist cpmod.dist %.tar.gz: cpfiles.dist cpmod.dist
mkdir -p $(DIST_PCKG_DIR) mkdir -p $(DIST_PCKG_DIR)
tar -czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR)) \ tar $(addprefix --exclude=,$(patsubst %,"%",$(basename $(shell find . -name *.in | sed 's%\./%*/%; s%\(.*\)%\1%g')))) \
$(addprefix --exclude=,$(patsubst %,"%",$(basename $(shell find . -name *.in | sed 's%\./%*/%; s%\(.*\)%\1%g')))) -czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR))
%.src.rpm: %.tar.gz %.src.rpm: %.tar.gz
rpm -ts $< rpm -ts $<
cp $(SRPMS_DIR)/$(notdir $@) $@ cp $(SRPMS_DIR)/$(notdir $@) $@
$(DIST_PCKG_RPM): $(DIST_PCKG_DIR)/$(PCKG_TAR) $(DIST_PCKG_RPM): $(DIST_PCKG_DIR)/$(PCKG_TAR)
if [ $< -nt $(RPMS_DIR)/$(notdir $@) ]; then rpm -tb $<; fi if [ $< -nt $(RPMS_DIR)/$(notdir $@) ]; then $(RPMBUILD) -tb $<; fi
cp $(RPMS_DIR)/$(notdir $@) $@ cp $(RPMS_DIR)/$(notdir $@) $@
$(DIST_PCKG_DIR)/CURRENT_%: $(TOPDIR)/VERSION $(DIST_PCKG_DIR)/CURRENT_%: $(TOPDIR)/VERSION
@ -106,7 +111,7 @@ rpminstall.dist: $(DIST_PCKG_RPM)
sudo /bin/rpm -U $< sudo /bin/rpm -U $<
touch $@ touch $@
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 $@