diff --git a/make/defs.mk b/make/defs.mk index 93c00dc3..292b4a2e 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -73,7 +73,7 @@ endif CVS_PROJ_DIR ?= $(TOPDIR)/.. CVSTOPDIR ?= $(CVS_PROJ_DIR)/.. -PROJECT_DESCR_FILE ?= $(wildcard $(TOPDIR)/doc/share/project.txt) +PROJECT_DESCR_FILE ?= $(wildcard $(TOPDIR)/make/project.conf) PROJECT_SHORT_NAME ?= $(PROJECT) PROJECT_CAPNAME = $(shell echo $(PROJECT) | tr [a-z] [A-Z] | $(SED) 's/-/_/g') PROJECT_DESCR ?= No description diff --git a/make/rpmdist.mk b/make/rpmdist.mk index b8e54404..7321dae0 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -74,6 +74,8 @@ BINARY_RPM += $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386) endif DIST_PCKG_SRPM = $(BINARY_RPM) $(DIST_PCKG_DIR)/$(PCKG_RPM_SRC) # to be replaced by pkg.sh +RPM_REQUIRES_DEVEL += $(call proj_query, pkg-requires devel $(PROJECT)) +RPM_REQUIRES_RUN += $(call proj_query, pkg-requires run $(PROJECT)) RPM_REQUIRES_DEVEL += $(RPM_PROJECT)-run = __NEXT_VERSION__ unexport RPM_VERSION VERSION DIST_SRC_DIR diff --git a/make/topdir.mk b/make/topdir.mk index 9b549842..f720f6cc 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -6,7 +6,7 @@ config: SUBDIRS ?= $(wildcard inst/pre make scripts contrib tools src include lib bin \ util plugins conf config cfg images doc test inst/post) -PROJECT_DESCR = $(TOPDIR)/doc/share/project.txt +PROJECT_DESCR = $(TOPDIR)/make/project.conf ifneq ($(wildcard $(TOPDIR)/make/defs.mk),) include $(TOPDIR)/make/defs.mk diff --git a/scripts/pkg.sh b/scripts/pkg.sh index df809e99..c611dfc3 100644 --- a/scripts/pkg.sh +++ b/scripts/pkg.sh @@ -851,7 +851,7 @@ CHECK_CVS_SYNC_BEFORE_RPM_RELEASE=false #LAST_RPM_VERSION=`read_map $TOPDIR/LAST_RPM_VERSION` myname=`basename $0` tmp_mkdef_sh="" -PROJECT_DESCR_FILE=$TOPDIR/doc/share/project.txt +PROJECT_DESCR_FILE=$TOPDIR/make/project.conf DIST_SRC_DIR=dist/src DIST_INST_DIR=dist/src DIST_PCKG_DIR=dist/pckg