packaging: use docs tarball instead of docs dir in makerpms / samba.spec

Michael
(cherry picked from commit f28a24d5eac2dcf99e1d00c2daf913dd9912eb4a)
(This used to be commit 5148e99d0951245632650784d18306db74ed87bd)

diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh
index c6192a1c809532f6b26bd6043912ad119f966e45..94714e4dddac623aa352a0e4bfb1866ca5bf9cd3 100755 (executable)
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ b/packaging/RHEL-CTDB/makerpms.sh
@@ -11,7 +11,7 @@
 #   /usr/src/redhat directory
 #
 
-# set DOCS_DIR to the path to a release tarball docs dir in order to get docs
+# set DOCS_TARBALL to the path to a docs release tarball in .tar.bz2 format
 
 # extra options passed to rpmbuild
 EXTRA_OPTIONS="$1"
@@ -26,6 +26,7 @@ GRPID=`id -g`
 VERSION='3.2.0'
 REVISION='ctdb'
 SPECFILE="samba.spec"
+DOCS="docs.tar.bz2"
 RPMVER=`rpm --version | awk '{print $3}'`
 RPM="rpmbuild"
 
@@ -52,9 +53,8 @@ popd
 pushd .
 cd ../../
 SRCTREE=`basename $PWD`
-if [ $DOCS_DIR ] && [ -d $DOCS_DIR ]; then
-    mv docs docs-orig
-    ln -s $DOCS_DIR docs
+if [ "x${DOCS_TARBALL}" != "x" ] && [ -f ${DOCS_TARBALL} ]; then
+    cp ${DOCS_TARBALL} ${SRCDIR}/${DOCS}
 fi
 cd ../
 chown -R ${USERID}.${GRPID} $SRCTREE
@@ -67,11 +67,6 @@ echo "Done."
 if [ $? -ne 0 ]; then
        popd
        cd ../../
-       # restore original structure if docs were specified
-       if [ ${DOCS_DIR} ] && [ -d docs-orig ] && [ -L docs ]; then
-           rm docs
-           mv docs-orig docs
-       fi
         echo "Build failed!"
         exit 1
 fi
@@ -103,12 +98,7 @@ ${RPM} -ba $EXTRA_OPTIONS $SPECFILE
 
 
 
-# restore original structure if docs were specified
 cd ../../
-if [ ${DOCS_DIR} ] && [ -d docs-orig ] && [ -L docs ]; then
-    rm docs
-    mv -f docs-orig docs
-fi
 
 echo "$(basename $0): Done."
 

diff --git a/packaging/RHEL-CTDB/samba.spec b/packaging/RHEL-CTDB/samba.spec
index 871410d435e8d2e13643760a4524bae2ac552840..f6454a33c6aa27f164db202d4912745537ed740a 100644 (file)
--- a/packaging/RHEL-CTDB/samba.spec
+++ b/packaging/RHEL-CTDB/samba.spec
@@ -15,6 +15,7 @@ URL: http://www.samba.org/
 Source: samba-%{version}.tar.bz2
 
 # Don't depend on Net::LDAP
+Source997: docs.tar.bz2
 Source998: filter-requires-samba.sh
 Source999: setup.tar.bz2
 
@@ -136,6 +137,7 @@ utilized by SWAT as well as the HTML and PDF version of "Using Samba",
 
 # setup the vendor files (init scripts, etc...)
 %setup -T -D -a 999 -n samba-%{version} -q
+%setup -T -D -a 997 -n samba-%{version} -q
 
 %build