summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packaging/RedHat/makerpms.sh.tmpl13
-rw-r--r--packaging/RedHat/samba.spec.tmpl (renamed from packaging/RedHat/samba2.spec.tmpl)21
2 files changed, 18 insertions, 16 deletions
diff --git a/packaging/RedHat/makerpms.sh.tmpl b/packaging/RedHat/makerpms.sh.tmpl
index ee5ebd5040..5daf508de8 100644
--- a/packaging/RedHat/makerpms.sh.tmpl
+++ b/packaging/RedHat/makerpms.sh.tmpl
@@ -28,6 +28,7 @@ SRCDIR=${SRCDIR:-/usr/src/redhat/SOURCES}
USERID=`id -u`
GRPID=`id -g`
VERSION='PVERSION'
+SPECFILE="samba3.spec"
RPMVER=`rpm --version | awk '{print $3}'`
RPM="rpm"
@@ -36,20 +37,20 @@ echo The RPM Version on this machine is: $RPMVER
case $RPMVER in
2*)
echo Building for RPM v2.x
- sed -e "s/MANDIR_MACRO/\%\{prefix\}\/man/g" < samba2.spec > samba.spec
+ sed -e "s/MANDIR_MACRO/\%\{prefix\}\/man/g" < samba.spec > $SPECFILE
;;
3*)
echo Building for RPM v3.x
- sed -e "s/MANDIR_MACRO/\%\{prefix\}\/man/g" < samba2.spec > samba.spec
+ sed -e "s/MANDIR_MACRO/\%\{prefix\}\/man/g" < samba.spec > $SPECFILE
;;
4.1*)
echo Building for RPM v4.1
RPM="rpmbuild"
- sed -e "s/MANDIR_MACRO/\%\{_mandir\}/g" < samba2.spec > samba.spec
+ sed -e "s/MANDIR_MACRO/\%\{_mandir\}/g" < samba.spec > $SPECFILE
;;
4*)
echo Building for RPM v4.x
- sed -e "s/MANDIR_MACRO/\%\{_mandir\}/g" < samba2.spec > samba.spec
+ sed -e "s/MANDIR_MACRO/\%\{_mandir\}/g" < samba.spec > $SPECFILE
;;
*)
echo "Unknown RPM version: `rpm --version`"
@@ -62,11 +63,11 @@ esac
( cd ../../.. ; tar --exclude=CVS -cf - samba-${VERSION}/. | bzip2 > ${SRCDIR}/samba-${VERSION}.tar.bz2 )
-cp -av samba.spec ${SPECDIR}
+cp -av $SPECFILE ${SPECDIR}
echo Getting Ready to build release package
cd ${SPECDIR}
-${RPM} -ba -v --clean --rmsource samba.spec
+${RPM} -ba -v --clean --rmsource $SPECFILE
echo Done.
diff --git a/packaging/RedHat/samba2.spec.tmpl b/packaging/RedHat/samba.spec.tmpl
index 12955f3222..d7b1750772 100644
--- a/packaging/RedHat/samba2.spec.tmpl
+++ b/packaging/RedHat/samba.spec.tmpl
@@ -117,15 +117,16 @@ ln -sf %{prefix}/sbin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb
# This allows us to get away without duplicating code that
# sombody else can maintain for us.
cd source
-make BASEDIR=$RPM_BUILD_ROOT/usr \
- CONFIGDIR=$RPM_BUILD_ROOT/etc/samba \
- LIBDIR=$RPM_BUILD_ROOT%{prefix}/lib/samba \
- VARDIR=$RPM_BUILD_ROOT/var \
- SBINDIR=$RPM_BUILD_ROOT%{prefix}/sbin \
- BINDIR=$RPM_BUILD_ROOT%{prefix}/bin \
- MANDIR=$RPM_BUILD_ROOTMANDIR_MACRO \
- SWATDIR=$RPM_BUILD_ROOT%{prefix}/share/swat \
- SAMBABOOK=$RPM_BUILD_ROOT%{prefix}/share/swat/using_samba \
+make DESTDIR=$RPM_BUILD_ROOT \
+ BASEDIR=/usr \
+ CONFIGDIR=/etc/samba \
+ LIBDIR=%{prefix}/lib/samba \
+ VARDIR=/var \
+ SBINDIR=%{prefix}/sbin \
+ BINDIR=$%{prefix}/bin \
+ MANDIR=MANDIR_MACRO \
+ SWATDIR=%{prefix}/share/swat \
+ SAMBABOOK=%{prefix}/share/swat/using_samba \
installman installswat installdat installmodules
cd ..
@@ -402,7 +403,7 @@ fi
%{prefix}/bin/smbtree
%attr(755,root,root) /lib/libnss_wins.s*
%attr(755,root,root) %{prefix}/lib/samba/vfs/*.so
-%attr(755,root,root) %{prefix}/lib/samba/pdb/*.so
+#%attr(755,root,root) %{prefix}/lib/samba/pdb/*.so
%attr(755,root,root) %{prefix}/lib/samba/*.dat
%{prefix}/include/libsmbclient.h
%{prefix}/lib/libsmbclient.a