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

Everywhere: Merge V_1_1_29_40_POST_ACCEPTANCE

Browse source
This commit is contained in:
Jan Lindemann 2011-02-20 14:15:22 +00:00 • committed by Jan Lindemann
commit 2939f8e3a8
29 changed files with 743 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

23
make/rpmdist.mk
View file

@ -1,7 +1,8 @@
CREATE_DEVEL ?= true
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
RPM_PROJECT ?= $(FLAVOUR_PREFIX)$(PROJECT)
MKSPEC_SH ?= $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
LOCAL_MKSPEC_SH ?= $(TOPDIR)/make/mkspec.sh
MKSPEC_SH ?= $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(LOCAL_MKSPEC_SH)
FTP_SRC_GROUP ?= $(shell id -g)
FTP_SRC_USER ?= $(shell whoami)
FTP_RUN_GROUP ?= $(shell id -g)
@ -69,20 +70,36 @@ ftag: ftag.dist
rpm-upload-stable: rpm-upload-STABLE.dist
rpm-upload-rc: rpm-upload-RC.dist
rpm-clean: clean.rpm
rpm-clean: clean.rpm clean.mkspec
rpm-uninstall: config rpmuninstall.dist
rpm-build: config rpmbuild.dist
rpm-install: config rpminstall.dist
rpm-reinstall: rpm-uninstall rpm-clean rpm-install
rpm-rebuild: rpm-clean rpm-build
clean.rpm:
rm -rf $(DIST_DIR) *.dist CURRENT_RPM_SRC
ifeq ($(PROJECT_DESCR_FILE),)
clean.mkspec:
else
$(LOCAL_MKSPEC_SH): $(PROJECT_DESCR_FILE)
sh $(MOD_SCRIPT_DIR)/create-mkspec.sh $< > $@.tmp
mv $@.tmp $@
clean.mkspec:
rm -f $(LOCAL_MKSPEC_SH) $(LOCAL_MKSPEC_SH).tmp
endif
src-dir.dist:
mkdir -p $(DIST_SRC_DIR)
touch $@
cpfiles.dist: src-dir.dist
cpfiles.dist: src-dir.dist $(LOCAL_MKSPEC_SH)
rm -rf $(DIST_SRC_DIR)/*
$(cvs_files) | grep -v VERSION | cpio -o -H newc | ( cd $(DIST_SRC_DIR); cpio --make-directories -i)
sh $(MKSPEC_SH) -V $(RPM_VERSION) -S $(notdir $(PCKG_TAR)) -N $(RPM_PROJECT) \