From ec0b8787915b88db15fa86bb6a737f114b01b41f Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 15 Aug 2007 23:00:18 +0000 Subject: [PATCH] rpmdist.mk: Fix RPM_VERSION (remove -dev) --- make/rpmdist.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index efb7d5d3..edc74e03 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -1,7 +1,7 @@ UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh ifeq ($(RPM_PROJECT),) -RPM_PROJECT = $(PROJECT) +RPM_PROJECT ?= $(PROJECT) endif 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_LOGIN ?= root RPM_PROJECT ?= $(PROJECT) -RPM_VERSION ?= $(VERSION) +RPM_VERSION ?= $(DIST_VERSION) RPM_ARCH ?= i586 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_DEVEL_I386 ?= $(RPM_PROJECT)-devel-$(RPM_VERSION).$(RPM_ARCH).rpm PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm -RPM_VERSION ?= $(VERSION) include $(MODDIR)/make/upload-defs.mk