mkspec.sh, ytools.mk.in: Use new mkspec.sh script

make/mkspec.sh

@@ -1,58 +1,3 @@
-#!/bin/sh
-
-MYNAME=`basename $0`
-INSTALL_LOG=/var/tmp/%{name}-buildroot/install.log
-
-usage()
-{
-	echo usage: $MYNAME -h [-N name] [-T topdir] [-V version] [-S source]
-	[ "$1" ] && exit $1
-}
-
-set -- `getopt T:V:S:N:h $*`
-
-while [ $1 != -- ]; do
-case $1 in
-	-h)
-		usage 0;;
-	-T)
-		TOPDIR=$2
-		shift;;
-	-V)
-		V=$2
-		shift;;
-	-S)
-		SOURCE=$2
-		shift;;
-	-N)
-		NAME=$2
-		shift;;
-	*)
-		usage 1;;
-esac
-shift
-done
-shift
-
-[ -z "$TOPDIR" ] && TOPDIR=.
-
-if [ -z "$V" ]; then
-	if [ -f $TOPDIR/VERSION ]; then
-		VERSION="`cat $TOPDIR/VERSION | cut -d- -f1`"
-		RELEASE="`cat $TOPDIR/VERSION | cut -d- -f2-`"
-	else
-		VERSION=noversion
-		RELEASE=norelease
-	fi
-else
-		VERSION="`echo $V | cut -d- -f1`"
-		RELEASE="`echo $V | cut -d- -f2-`"
-fi
-
-if [ -z "$NAME" ]; then
-	NAME=`pwd | xargs basename`
-fi
-
 echo "Name: $NAME"
 echo "Summary: Jannet IT Services Tool Library"
 echo "Version: $VERSION"

make/ytools.mk.in

@@ -29,7 +29,7 @@ VERSION_STR = \"@PACKAGE_VERSION@\"
 DEVELOPMENT = @IS_DEVELOPMENT_VERSION@
 
 # rpmdist.mk variables
-MKSPEC_SH        = $(TOPDIR)/make/mkspec.sh
+MKSPEC_SH        = $(MODDIR)/devutil/scripts/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
 FTP_SRC_GROUP    = ytsrc
 FTP_SRC_USER     = jan
 FTP_RUN_GROUP    = ytrun