integrate contrib version bits to make-and-stage-release

contrib/redhat-rpm/conserver.spec

@@ -4,7 +4,7 @@
 #
 
 %define pkg conserver
-%define ver 8.2.3
+%define ver 
 
 # define the name of the machine on which the main conserver
 # daemon will be running if you don't want to use the default

contrib/solaris-package/pkginfo

@@ -1,7 +1,7 @@
 PKG="conserver"
 NAME="Console server and client"
 CATEGORY="system"
-VERSION="8.2.3"
+VERSION=
 DESC="Console server and client"
 CLASSES=none
 ARCH=sparc

package/make-and-stage-release

@@ -15,6 +15,8 @@ if [ ! -f ../conserver-$ver.tar.gz ] || $local; then
 	cd build/conserver-$ver
 	../../package/setup-configure
 	rm -rf package
+	sed -i "" -e "/^%define ver/s| ver.*| ver $ver|" contrib/redhat-rpm/conserver.spec
+	sed -i "" -e "/^VERSION=/s|.*|VERSION=\"$ver\"|" contrib/solaris-package/pkginfo
     )
     $local && exit
     echo "Creating ../conserver-$ver.tar.gz"

package/replicate-version-number

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-maj=`grep MAJOR conserver/version.h | awk '{print $NF; exit}'`
-min=`grep MINOR conserver/version.h | awk '{print $NF; exit}'`
-rev=`grep REV conserver/version.h | awk '{print $NF; exit}'`
-ver="$maj.$min.$rev"
-date=`grep '^version' CHANGES | head -1 | sed -e 's/.*(\(.*\)).*/\1/'`
-mandate=`date -j -f '%b %d, %Y' "$date" "+%Y/%m/%d"`
-
-for i in c*/*.man; do
-    sed -i "" -e "/^\.TH /s|\".*|\"$mandate\" \"conserver-$ver\" \"conserver\"|" "$i"
-done
-
-sed -i "" -e "/^%define ver/s| ver .*| ver $ver|" contrib/redhat-rpm/conserver.spec
-sed -i "" -e "/^VERSION=/s|.*|VERSION=\"$ver\"|" contrib/solaris-package/pkginfo