r13124: working on RHEL/Fedora packaging for 64-bit platforms and general cleanup

(This used to be commit 4a8e457846a49647c751ae09365539acb5c02ce2)

13 files changed, 34 insertions, 43 deletions

diff --git a/packaging/RHEL/makerpms.sh.tmpl b/packaging/RHEL/makerpms.sh.tmpl
index 361d8418761..e6c178f6f3c 100644
--- a/packaging/RHEL/makerpms.sh.tmpl
+++ b/packaging/RHEL/makerpms.sh.tmpl
@@ -39,22 +39,13 @@ esac
 ( cd ../../source; if [ -f Makefile ]; then make distclean; fi )
 ( cd ../../.. ; chown -R ${USERID}.${GRPID} samba-${VERSION} )
 
-( cd ../../.. ; tar --exclude=CVS -cf - samba-${VERSION}/. | bzip2 > ${SRCDIR}/samba-${VERSION}.tar.bz2 )
+( cd ../../.. ; tar --exclude=.svn -cf - samba-${VERSION}/. | bzip2 > ${SRCDIR}/samba-${VERSION}.tar.bz2 )
 
 ##
 ## copy additional source files
 ##
-for file in samba.pamd samba.sysconfig samba.spec \
-	smb.init swat.desktop filter-requires-samba.sh \
-	samba.log samba.xinetd smbprint winbind.init \
-	smb.conf smbusers
-do
-	cp -p $file ${SRCDIR}
-
-done
-
-chmod 755 ${SRCDIR}/filter-requires-samba.sh
-
+chmod 755 setup/filter-requires-samba.sh
+tar --exclude=.svn -jcvf - setup > ${SRCDIR}/setup.tar.bz2
 cp -p ${SPECFILE} ${SPECDIR}
 
 ##
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 9afd9238084..1a19e495607 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -11,32 +11,28 @@ License: GNU GPL version 2
 Group: System Environment/Daemons
 URL: http://www.samba.org/
 
-Source: samba-%{version}.tar.gz
-Source1:  samba.log
-Source3:  swat
-Source4:  samba.sysconfig
-Source5:  smb.init
-Source6:  winbind.init
-Source7:  samba.pamd
-Source8:  smbprint
-Source9:  smbusers
-Source10: smb.conf
+Source: samba-%{version}.tar.bz2
 
 # Don't depend on Net::LDAP
-Source999: filter-requires-samba.sh
+Source998: filter-requires-samba.sh
+Source999: setup.tar.bz2
 
 Requires: pam >= 0.64 %{auth} samba-common = %{version}
 Requires: logrotate >= 3.4 initscripts >= 5.54-1
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall
 Prereq: fileutils sed /etc/init.d
-BuildRequires: pam-devel, readline-devel, ncurses-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel
+BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel
 Provides: samba = %{version}
 Obsoletes: samba-common, samba-client, samba-swat
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prefix: /usr
 
+# Working around perl dependency problem from docs
+%define __perl_requires %{SOURCE998}
+
+
 %description
 Samba is the protocol by which a lot of PC-related machines share
 files, printers, and other information (such as lists of available
@@ -84,13 +80,13 @@ Web browser.
 %prep
 %setup -q
 
-# copy Red Hat specific scripts
-cp %{SOURCE5} packaging/Fedora/
-cp %{SOURCE6} packaging/Fedora/
-cp %{SOURCE7} packaging/Fedora/
-cp %{SOURCE8} packaging/Fedora/winbind.init
+# setup the vendor files (init scripts, etc...)
+%setup -T -D -a 999 -n samba-%{version} -q
 
 %build
+
+/bin/cp setup/filter-requires-samba.sh %{SOURCE998}
+
 cd source
 %ifarch i386 sparc
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
@@ -198,17 +194,22 @@ install -m 755 source/bin/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/libsmbclient
 install -m 755 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient.a
 install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir}
 ln -s %{_libdir}/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so.0
-if [ %{_libdir} == /usr/lib64 ];then
-	ln -s %{_libdir}/libsmbclient.so $RPM_BUILD_ROOT/usr/lib/libsmbclient.so.0
-	ln -s %{_libdir}/libsmbclient.so $RPM_BUILD_ROOT/usr/lib/libsmbclient.so
-fi
+#if [ %{_libdir} == /usr/lib64 ];then
+#	ln -s %{_libdir}/libsmbclient.so $RPM_BUILD_ROOT/usr/lib/libsmbclient.so.0
+#	ln -s %{_libdir}/libsmbclient.so $RPM_BUILD_ROOT/usr/lib/libsmbclient.so
+#fi
 
 # make install puts libmsrpc.so in the wrong place on x86_64
+rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.so $RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.a || true
 install -m 755 source/bin/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so
 install -m 755 source/bin/libmsrpc.a $RPM_BUILD_ROOT%{_libdir}/libmsrpc.a
 install -m 644 source/include/libmsrpc.h $RPM_BUILD_ROOT%{_includedir}
 rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libmsrpc.*
 ln -s /%{_libdir}/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so.0
+#if [ %{_libdir} == /usr/lib64 ];then
+#	ln -s %{_libdir}/libmsrpc.so $RPM_BUILD_ROOT/usr/lib/libmsrpc.so.0
+#	ln -s %{_libdir}/libmsrpc.so $RPM_BUILD_ROOT/usr/lib/libmsrpc.so
+#fi
 
 # Install pam_smbpass.so
 install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
@@ -220,15 +221,15 @@ ln -sf %{_prefix}/sbin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb
 # Install the miscellany
 echo 127.0.0.1 localhost > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts
 
-install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/samba
-install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/swat
-install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
-install -m755 %{SOURCE5} $RPM_BUILD_ROOT%{initdir}/smb
-install -m755 %{SOURCE6} $RPM_BUILD_ROOT%{initdir}/winbind
-install -m644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
-install -m755 %{SOURCE8} $RPM_BUILD_ROOT%{_bindir}
-install -m644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
-install -m644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
+install -m644 setup/samba.log $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/samba
+install -m644 setup/swat $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/swat
+install -m644 setup/samba.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
+install -m755 setup/smb.init $RPM_BUILD_ROOT%{initdir}/smb
+install -m755 setup/winbind.init $RPM_BUILD_ROOT%{initdir}/winbind
+install -m644 setup/samba.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
+install -m755 setup/smbprint $RPM_BUILD_ROOT%{_bindir}
+install -m644 setup/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
+install -m644 setup/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
 install -m755 source/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
 install -m755 source/client/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
 install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
@@ -327,7 +328,6 @@ fi
 %attr(755,root,root) %config %{initdir}/smb
 %config(noreplace) %{_sysconfdir}/logrotate.d/samba
 %config(noreplace) %{_sysconfdir}/pam.d/samba
-%{_sysconfdir}/samba/samba.xinetd
 %{_mandir}/man1/smbcontrol.1*
 %{_mandir}/man1/smbstatus.1*
 %{_mandir}/man1/vfstest.1*
diff --git a/packaging/RHEL/filter-requires-samba.sh b/packaging/RHEL/setup/filter-requires-samba.sh
index 5545cf6c858..5545cf6c858 100755
--- a/packaging/RHEL/filter-requires-samba.sh
+++ b/packaging/RHEL/setup/filter-requires-samba.sh
diff --git a/packaging/RHEL/samba.log b/packaging/RHEL/setup/samba.log
index a3c000ea788..a3c000ea788 100644
--- a/packaging/RHEL/samba.log
+++ b/packaging/RHEL/setup/samba.log
diff --git a/packaging/RHEL/samba.pamd b/packaging/RHEL/setup/samba.pamd
index f88aae628c2..f88aae628c2 100644
--- a/packaging/RHEL/samba.pamd
+++ b/packaging/RHEL/setup/samba.pamd
diff --git a/packaging/RHEL/samba.sysconfig b/packaging/RHEL/setup/samba.sysconfig
index 944b72fcc28..944b72fcc28 100644
--- a/packaging/RHEL/samba.sysconfig
+++ b/packaging/RHEL/setup/samba.sysconfig
diff --git a/packaging/RHEL/smb.conf b/packaging/RHEL/setup/smb.conf
index 133e442b1e7..133e442b1e7 100644
--- a/packaging/RHEL/smb.conf
+++ b/packaging/RHEL/setup/smb.conf
diff --git a/packaging/RHEL/smb.init b/packaging/RHEL/setup/smb.init
index 30d7d403dd9..30d7d403dd9 100644
--- a/packaging/RHEL/smb.init
+++ b/packaging/RHEL/setup/smb.init
diff --git a/packaging/RHEL/smbprint b/packaging/RHEL/setup/smbprint
index 1c3959d49b5..1c3959d49b5 100644
--- a/packaging/RHEL/smbprint
+++ b/packaging/RHEL/setup/smbprint
diff --git a/packaging/RHEL/smbusers b/packaging/RHEL/setup/smbusers
index ae3389f53f8..ae3389f53f8 100644
--- a/packaging/RHEL/smbusers
+++ b/packaging/RHEL/setup/smbusers
diff --git a/packaging/RHEL/swat b/packaging/RHEL/setup/swat
index 8b62348dde3..8b62348dde3 100644
--- a/packaging/RHEL/swat
+++ b/packaging/RHEL/setup/swat
diff --git a/packaging/RHEL/swat.desktop b/packaging/RHEL/setup/swat.desktop
index 0d7b4b5c48c..0d7b4b5c48c 100644
--- a/packaging/RHEL/swat.desktop
+++ b/packaging/RHEL/setup/swat.desktop
diff --git a/packaging/RHEL/winbind.init b/packaging/RHEL/setup/winbind.init
index e778e61e9cf..e778e61e9cf 100644
--- a/packaging/RHEL/winbind.init
+++ b/packaging/RHEL/setup/winbind.init