X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=packaging%2Frpm%2Fbuildpkg;h=72298a704c75e05a2d4ef6a449e4a9b8f25197cc;hb=fd48f3e498442f0cbff5f3606c7c403d0566150e;hp=afdc05c14a6e05a44dc654c4c109fb9852c841de;hpb=96f35b20267e8b1a1c846d476f27fcd330e0b018;p=debian%2Famanda

diff --git a/packaging/rpm/buildpkg b/packaging/rpm/buildpkg
index afdc05c..72298a7 100755
--- a/packaging/rpm/buildpkg
+++ b/packaging/rpm/buildpkg
@@ -8,10 +8,7 @@
 # AMVER: the version of amanda we're working on.  This will become part of the
 #     rpm name.  AMVER must line up with the version number mentioned in the
 #     .spec file.
-# AMTARBALL: the name of the tarball which contains the source code.  it must
-#     unpack into a directory named AMVER.  It's easiest and safest to just 
-#     let the script create a new one for you, even if it's a bit more overhead
-# AMPKGDIR: Rpmbuild expects absolute paths, so we provide this var.  It also
+# PKG_DIR: Rpmbuild expects absolute paths, so we provide this var.  It also
 #     allows you to build somewhere other than `pwd`.  You probably don't want
 #     to use the system-wide location, as the script tries to blow these
 #     directories away.
@@ -23,34 +20,29 @@
 # statements immediately above it. good luck.
 
 # This is useful for debugging
-set -x
-# Buildbot exports some useful env variables.
-# Check for $AMVER.  I couldn't come up with a good way to detect it.
+ set -x
+# Check for $AMVER, or pull it from configure.in
 if [ -z $AMVER ]; then
-    AMVER=amanda-2.6.1p2
+    VER=`cat FULL_VERSION`
+    AMVER=amanda-${VER}
 fi
 
-# Check for AMTARBALL variable.
-if [ -z $AMTARBALL ]; then 
-    AMTARBALL=$AMVER.tar.gz
-fi
-
-# Check for AMTARBALL file, if it's not there, create it.
-if [ ! -f ${AMTARBALL} ]; then
-    mkdir ${AMVER}
+PKG_TARBALL=${AMVER}.tar.gz
+if [ ! -f "${PKG_TARBALL}" ]; then
+    mkdir ${AMVER} || exit 1
     cp -Rfp * ${AMVER}/
-    tar -cf ${AMTARBALL} -z ${AMVER} || exit 1
-    rm -rf ${AMVER}
+    tar -cf ${PKG_TARBALL} -z ${AMVER} || exit 1
+    rm -rf ${AMVER} || exit 1
 fi
 
 # Check for the packaging dirs.
-if [ -z $AMPKGDIR ]; then
-    AMPKGDIR=${PWD}
+if [ -z "$PKG_DIR" ]; then
+    PKG_DIR=${PWD}
 fi
-if [ ! -d ${AMPKGDIR} ]; then
-    mkdir ${AMPKGDIR} || exit 1
+if [ ! -d ${PKG_DIR} ]; then
+    mkdir ${PKG_DIR} || exit 1
 fi
-cd ${AMPKGDIR}
+cd ${PKG_DIR}
 
 if [ -d rpm ]; then
     rm -rf rpm || exit 1
@@ -62,13 +54,13 @@ mkdir rpm/SPECS
 mkdir rpm/BUILD
 mkdir rpm/RPMS || exit 1
 
-# Make a copy of the tarball with the name that rpmbuild expects
-cp ${AMTARBALL} rpm/SOURCES/${AMVER}.tar.gz || exit 1
+# Make a copy of the tarball in the rpmbuild location
+cp ${PKG_TARBALL} rpm/SOURCES/${PKG_TARBALL} || exit 1
 cp packaging/rpm/amanda.spec rpm/SPECS || exit 1
 # Rpmbuild requires absolute paths.  annoying.  If you need to change the 
 # default value of some rpm.spec variable, just pass extra --define options.
 # this is useful for changing %amanda_release or %amanda_version
-rpmbuild -ba --define "_topdir ${AMPKGDIR}/rpm" \
-             ${AMPKGDIR}/rpm/SPECS/amanda.spec || exit 1
+rpmbuild -ba --define "_topdir ${PKG_DIR}/rpm" \
+             ${PKG_DIR}/rpm/SPECS/amanda.spec || exit 1
 cp rpm/RPMS/*/*.rpm . || exit 1
 cp rpm/SRPMS/*.rpm . || exit 1