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

diff --git a/packaging/rpm/buildpkg b/packaging/rpm/buildpkg
index e76367c..afdc05c 100755
--- a/packaging/rpm/buildpkg
+++ b/packaging/rpm/buildpkg
@@ -1,13 +1,35 @@
 #!/bin/bash
-# Buildpkg script for producing RPM packages. Does not require root access.
+
+# Buildpkg script for producing RPM packages. (Does not require root access.)
+# Buildpkg is designed to be used by both buildbot (to automate rpm production)
+# and by J Random User (to build an rpm for kicks).  The odd way of handling
+# all optioins through environment variables is a product of buildbot.
+#
+# 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
+#     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.
+# 
+# Other Hints:
+# Not everyone will want to use the ./configure options we provide.  The
+# easiest way to change them is by editing the .spec file.  This isn't so
+# easy, unfortunately.  Look at the %build section, and the %define xxxx 
+# 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.
 if [ -z $AMVER ]; then
-    AMVER=amanda-2.6.0
+    AMVER=amanda-2.6.1p2
 fi
+
 # Check for AMTARBALL variable.
 if [ -z $AMTARBALL ]; then 
     AMTARBALL=$AMVER.tar.gz
@@ -17,7 +39,7 @@ fi
 if [ ! -f ${AMTARBALL} ]; then
     mkdir ${AMVER}
     cp -Rfp * ${AMVER}/
-    tar -cf ${AMTARBALL} -z ${AMVER}
+    tar -cf ${AMTARBALL} -z ${AMVER} || exit 1
     rm -rf ${AMVER}
 fi
 
@@ -26,25 +48,27 @@ if [ -z $AMPKGDIR ]; then
     AMPKGDIR=${PWD}
 fi
 if [ ! -d ${AMPKGDIR} ]; then
-    mkdir ${AMPKGDIR}
+    mkdir ${AMPKGDIR} || exit 1
 fi
 cd ${AMPKGDIR}
 
 if [ -d rpm ]; then
-    rm -rf rpm
+    rm -rf rpm || exit 1
 fi
 mkdir rpm
 mkdir rpm/SOURCES
 mkdir rpm/SRPMS
 mkdir rpm/SPECS
 mkdir rpm/BUILD
-mkdir rpm/RPMS
+mkdir rpm/RPMS || exit 1
 
 # Make a copy of the tarball with the name that rpmbuild expects
-cp ${AMTARBALL} rpm/SOURCES/${AMVER}.tar.gz
-cp packaging/rpm/amanda.spec rpm/SPECS/amanda.spec
+cp ${AMTARBALL} rpm/SOURCES/${AMVER}.tar.gz || 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 
+             ${AMPKGDIR}/rpm/SPECS/amanda.spec || exit 1
+cp rpm/RPMS/*/*.rpm . || exit 1
+cp rpm/SRPMS/*.rpm . || exit 1