janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-28 15:52:49 +01:00
Code Activity

rpmdist.mk: Fix RPM_VERSION (remove -dev)

Browse source
This commit is contained in:
Jan Lindemann 2007-08-15 23:00:18 +00:00 • committed by Jan Lindemann
commit ec0b878791
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
make/rpmdist.mk
View file

@ -1,7 +1,7 @@
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
ifeq ($(RPM_PROJECT),) ifeq ($(RPM_PROJECT),)
RPM_PROJECT = $(PROJECT) RPM_PROJECT ?= $(PROJECT)
endif endif
MKSPEC_SH ?= $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh MKSPEC_SH ?= $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
@ -17,7 +17,7 @@ FTP_DIR_MODE ?= 755
FTP_HOST ?= ftp.jannet.de FTP_HOST ?= ftp.jannet.de
FTP_HOST_LOGIN ?= root FTP_HOST_LOGIN ?= root
RPM_PROJECT ?= $(PROJECT) RPM_PROJECT ?= $(PROJECT)
RPM_VERSION ?= $(VERSION) RPM_VERSION ?= $(DIST_VERSION)
RPM_ARCH ?= i586 RPM_ARCH ?= i586
RPMBUILD ?= rpmbuild RPMBUILD ?= rpmbuild
@ -31,7 +31,6 @@ PCKG_TAR ?= $(RPM_PROJECT)-$(RPM_VERSION).tar.gz
PCKG_RPM_RUN_I386 ?= $(RPM_PROJECT)-run-$(RPM_VERSION).$(RPM_ARCH).rpm PCKG_RPM_RUN_I386 ?= $(RPM_PROJECT)-run-$(RPM_VERSION).$(RPM_ARCH).rpm
PCKG_RPM_DEVEL_I386 ?= $(RPM_PROJECT)-devel-$(RPM_VERSION).$(RPM_ARCH).rpm PCKG_RPM_DEVEL_I386 ?= $(RPM_PROJECT)-devel-$(RPM_VERSION).$(RPM_ARCH).rpm
PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm
RPM_VERSION ?= $(VERSION)
include $(MODDIR)/make/upload-defs.mk include $(MODDIR)/make/upload-defs.mk