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

rpmdist.mk, mkspec-wrapper.sh: Use all the required packages, seperated by spaces

Browse source
This commit is contained in:
Jan Lindemann 2002-07-25 22:00:18 +00:00 • committed by Jan Lindemann
commit 609c5b6fb3
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
make/rpmdist.mk
View file

@ -71,15 +71,11 @@ cpmod.dist:
done done
touch $@ touch $@
ifneq ($(RPM_REQUIRED),)
RPM_REQUIRED_FLAG = -R "$(RPM_REQUIRED)"
endif
cpfiles.dist: cpfiles.dist:
mkdir -p $(DIST_SRC_DIR) mkdir -p $(DIST_SRC_DIR)
cp Makefile $(DIST_SRC_DIR) cp Makefile $(DIST_SRC_DIR)
cp configure.ac.tmpl $(DIST_SRC_DIR) cp configure.ac.tmpl $(DIST_SRC_DIR)
sh $(MKSPEC_SH) -V $(RPM_VERSION) -S $(notdir $(PCKG_TAR)) -N $(RPM_PROJECT) $(RPM_REQUIRED_FLAG) \ sh $(MKSPEC_SH) -V $(RPM_VERSION) -S $(notdir $(PCKG_TAR)) -N $(RPM_PROJECT) -R "$(RPM_REQUIRED)" \
-P $(PROJECT) \ -P $(PROJECT) \
> $(DIST_SRC_DIR)/$(RPM_PROJECT)-$(RPM_VERSION).spec > $(DIST_SRC_DIR)/$(RPM_PROJECT)-$(RPM_VERSION).spec
echo $(RPM_VERSION) > $(DIST_SRC_DIR)/VERSION echo $(RPM_VERSION) > $(DIST_SRC_DIR)/VERSION

9
scripts/mkspec-wrapper.sh
View file

@ -11,9 +11,9 @@ usage()
[ "$1" ] && exit $1 [ "$1" ] && exit $1
} }
set -- `getopt P:T:V:S:N:hR: $*` set -- `getopt P:T:V:S:N:hR: "$@"`
while [ $1 != -- ]; do while [ "$1" != -- ]; do
case $1 in case $1 in
-h) -h)
usage 0;; usage 0;;
@ -30,7 +30,10 @@ case $1 in
NAME="$2" NAME="$2"
shift;; shift;;
-R) -R)
REQUIRES="$2" while [ "`echo $2 | cut -c1`" != "-" ]; do
REQUIRES="$REQUIRES $2"
shift
done
shift;; shift;;
-P) -P)
PROJECT="$2" PROJECT="$2"