From c5a443ca8712a3157f99c27ee76c9de331e32d7a Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Thu, 31 Mar 2005 17:53:07 +0000 Subject: [PATCH] Move all development from /usr/src to $HOME/src. Use lsb-rpm to make an LSB compatible package. Force included S-Lang to avoid dependency problems. --- maint/mcsnap | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/maint/mcsnap b/maint/mcsnap index 568fb80a4..d12ebca27 100755 --- a/maint/mcsnap +++ b/maint/mcsnap @@ -21,13 +21,13 @@ upload() { set -e # Version to make patches against. -# Make sure to have it unpacked in /usr/src +# The source tree should be available in uncompressed form BASE_VERSION="4.6.0" # Local directories -MC_BASE_DIR="/usr/src/mc-$BASE_VERSION" -MC_CVS_DIR="/usr/src/mc" -MC_BUILD_DIR="/usr/src/mc.snap" +MC_BASE_DIR="$HOME/src/mc-$BASE_VERSION" +MC_CVS_DIR="$HOME/src/mc" +MC_BUILD_DIR="$HOME/src/mc.snap" RPM_SRC_DIR="$MC_BUILD_DIR/rpm" # Location of the snapshot directory @@ -35,6 +35,9 @@ SITE="login.ibiblio.org" DIR="/public/ftp/pub/Linux/utils/file/managers/mc/snapshots" # DIR="/public/html/mc/snapshots" +# Command for building RPM +RPMBUILD=lsb-rpm + cd "$MC_CVS_DIR" cvs up -dPA test -d "$MC_BUILD_DIR" && chmod -R u+rwx "$MC_BUILD_DIR" @@ -72,7 +75,8 @@ mkdir "$RPM_SRC_DIR/BUILD" mkdir "$RPM_SRC_DIR/RPMS" mkdir "$RPM_SRC_DIR/RPMS/i386" mkdir "$RPM_SRC_DIR/SPECS" -rpmbuild -tb --define="_topdir $RPM_SRC_DIR" "$MCTARBALL" +$RPMBUILD -tb --define="_topdir $RPM_SRC_DIR" \ + --define="_with_included_slang 1" "$MCTARBALL" MC_RPM_VERSION=`echo $MCVERSION | sed s/-//g` MC_RPM=$RPM_SRC_DIR/RPMS/i386/mc-$MC_RPM_VERSION-1.i386.rpm if test ! -f $MC_RPM; then