Hi
there
Here is a quick patch to correct the behaviour when trying to build a redhat rpm
in a directory other than the default. The .rpmacros file should not need to be
executable and the inequality operator in Bourne shell is '!=' not
'<>'
Best
Regards
Andrew Bird (Unix
Consultant)
diff -c -r -N
samba-2.2.7a/packaging/RedHat/makerpms.sh
samba-2.2.7a.mypatched/packaging/RedHat/makerpms.sh
*** samba-2.2.7a/packaging/RedHat/makerpms.sh 2002-12-11 15:34:35.000000000 +0000
--- samba-2.2.7a.mypatched/packaging/RedHat/makerpms.sh 2002-12-30 10:30:26.000000000 +0000
***************
*** 12,20 ****
# Note: Under this directory rpm expects to find the same directories that are under the
# /usr/src/redhat directory
#
! if [ -x ~/.rpmmacros ]; then
TOPDIR=`awk '/topdir/ {print $2}' < ~/.rpmmacros`
! if [ z$TOPDIR <> "z" ]; then
SPECDIR=${TOPDIR}/SPECS
SRCDIR=${TOPDIR}/SOURCES
fi
--- 12,20 ----
# Note: Under this directory rpm expects to find the same directories that are under the
# /usr/src/redhat directory
#
! if [ -f ~/.rpmmacros ]; then
TOPDIR=`awk '/topdir/ {print $2}' < ~/.rpmmacros`
! if [ z$TOPDIR != "z" ]; then
SPECDIR=${TOPDIR}/SPECS
SRCDIR=${TOPDIR}/SOURCES
fi
diff -c -r -N samba-2.2.7a/packaging/RedHat/makerpms.sh.tmpl samba-2.2.7a.mypatched/packaging/RedHat/makerpms.sh.tmpl
*** samba-2.2.7a/packaging/RedHat/makerpms.sh.tmpl 2002-12-10 14:58:00.000000000 +0000
--- samba-2.2.7a.mypatched/packaging/RedHat/makerpms.sh.tmpl 2002-12-30 10:31:00.000000000 +0000
***************
*** 12,20 ****
# Note: Under this directory rpm expects to find the same directories that are under the
# /usr/src/redhat directory
#
! if [ -x ~/.rpmmacros ]; then
TOPDIR=`awk '/topdir/ {print $2}' < ~/.rpmmacros`
! if [ z$TOPDIR <> "z" ]; then
SPECDIR=${TOPDIR}/SPECS
SRCDIR=${TOPDIR}/SOURCES
fi
--- 12,20 ----
# Note: Under this directory rpm expects to find the same directories that are under the
# /usr/src/redhat directory
#
! if [ -f ~/.rpmmacros ]; then
TOPDIR=`awk '/topdir/ {print $2}' < ~/.rpmmacros`
! if [ z$TOPDIR != "z" ]; then
SPECDIR=${TOPDIR}/SPECS
SRCDIR=${TOPDIR}/SOURCES
fi
*** samba-2.2.7a/packaging/RedHat/makerpms.sh 2002-12-11 15:34:35.000000000 +0000
--- samba-2.2.7a.mypatched/packaging/RedHat/makerpms.sh 2002-12-30 10:30:26.000000000 +0000
***************
*** 12,20 ****
# Note: Under this directory rpm expects to find the same directories that are under the
# /usr/src/redhat directory
#
! if [ -x ~/.rpmmacros ]; then
TOPDIR=`awk '/topdir/ {print $2}' < ~/.rpmmacros`
! if [ z$TOPDIR <> "z" ]; then
SPECDIR=${TOPDIR}/SPECS
SRCDIR=${TOPDIR}/SOURCES
fi
--- 12,20 ----
# Note: Under this directory rpm expects to find the same directories that are under the
# /usr/src/redhat directory
#
! if [ -f ~/.rpmmacros ]; then
TOPDIR=`awk '/topdir/ {print $2}' < ~/.rpmmacros`
! if [ z$TOPDIR != "z" ]; then
SPECDIR=${TOPDIR}/SPECS
SRCDIR=${TOPDIR}/SOURCES
fi
diff -c -r -N samba-2.2.7a/packaging/RedHat/makerpms.sh.tmpl samba-2.2.7a.mypatched/packaging/RedHat/makerpms.sh.tmpl
*** samba-2.2.7a/packaging/RedHat/makerpms.sh.tmpl 2002-12-10 14:58:00.000000000 +0000
--- samba-2.2.7a.mypatched/packaging/RedHat/makerpms.sh.tmpl 2002-12-30 10:31:00.000000000 +0000
***************
*** 12,20 ****
# Note: Under this directory rpm expects to find the same directories that are under the
# /usr/src/redhat directory
#
! if [ -x ~/.rpmmacros ]; then
TOPDIR=`awk '/topdir/ {print $2}' < ~/.rpmmacros`
! if [ z$TOPDIR <> "z" ]; then
SPECDIR=${TOPDIR}/SPECS
SRCDIR=${TOPDIR}/SOURCES
fi
--- 12,20 ----
# Note: Under this directory rpm expects to find the same directories that are under the
# /usr/src/redhat directory
#
! if [ -f ~/.rpmmacros ]; then
TOPDIR=`awk '/topdir/ {print $2}' < ~/.rpmmacros`
! if [ z$TOPDIR != "z" ]; then
SPECDIR=${TOPDIR}/SPECS
SRCDIR=${TOPDIR}/SOURCES
fi
