diff options
author | Michael Adam <obnox@samba.org> | 2011-05-06 12:03:52 +0200 |
---|---|---|
committer | Michael Adam <obnox@samba.org> | 2011-05-18 22:00:24 +0200 |
commit | b7588755e7c021e4071691787686b07f8041845e (patch) | |
tree | 49c7e61052ee62e6fca0da62b9858b8ad85c3acc /packaging | |
parent | ab628716e0c989a9d80afbdff58ecda863330b67 (diff) | |
download | samba-b7588755e7c021e4071691787686b07f8041845e.tar.gz samba-b7588755e7c021e4071691787686b07f8041845e.tar.bz2 samba-b7588755e7c021e4071691787686b07f8041845e.zip |
packaging(RHEL-CTDB): Remove the packaging of the winbind-32bit compat package
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/RHEL-CTDB/samba.spec.tmpl | 111 |
1 files changed, 0 insertions, 111 deletions
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index 479e985e54..191b67f9dd 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -95,15 +95,6 @@ The samba-swat package includes the new SWAT (Samba Web Administration Tool), for remotely managing Samba's smb.conf file using your favorite Web browser. -%ifarch x86_64 ppc64 -%package winbind-32bit -Summary: Samba winbind compatibility package for 32bit apps on 64bit archs -Group: Applications/System - -%description winbind-32bit -Compatibility package for 32 bit apps on 64 bit architecures -%endif - ####################################################################### %package doc @@ -146,81 +137,6 @@ export CC ./autogen.sh -## -## build the files for the winbind-32bit compat package -## and copy them to a safe location -## -%ifarch x86_64 ppc64 - -# a directory to store the 32bit compatibility modules for later install -%define _32bit_tmp_dir %{_tmppath}/%{name}-%{version}-32bit - -CC_SAVE="$CC" -CC="$CC -m32" - -CFLAGS="$RPM_OPT_FLAGS -O3 -D_GNU_SOURCE -m32" ./configure \ - --prefix=%{_prefix} \ - --localstatedir=/var \ - --with-configdir=%{_sysconfdir}/samba \ - --with-libdir=/usr/lib/samba \ - --with-pammodulesdir=/lib/security \ - --with-lockdir=/var/lib/samba \ - --with-logfilebase=/var/log/samba \ - --with-mandir=%{_mandir} \ - --with-piddir=/var/run \ - --with-privatedir=%{_sysconfdir}/samba \ - --disable-cups \ - --with-acl-support \ - --with-ads \ - --with-automount \ - --with-fhs \ - --with-pam_smbpass \ - --with-libsmbclient \ - --with-libsmbsharemodes \ - --without-smbwrapper \ - --with-pam \ - --with-quotas \ - --with-syslog \ - --with-utmp \ - --with-cluster-support \ - --with-ctdb=/usr/include \ - --without-ldb \ - --without-dnsupdate \ - --with-aio-support \ - --disable-merged-build - -make showlayout - -make samba3-idl - -## check for gcc 3.4 or later -CC_VERSION=`${CC} --version | head -1 | awk '{print $3}'` -CC_MAJOR=`echo ${CC_VERSION} | cut -d. -f 1` -CC_MINOR=`echo ${CC_VERSION} | cut -d. -f 2` -if [ ${CC_MAJOR} -ge 3 ]; then - if [ ${CC_MAJOR} -gt 3 -o ${CC_MINOR} -ge 4 ]; then - make pch - fi -fi - -make -j%{numcpu} %{?_smp_mflags} \ - nss_modules pam_modules - -rm -rf %{_32bit_tmp_dir} -mkdir %{_32bit_tmp_dir} - -mv ../nsswitch/libnss_winbind.so %{_32bit_tmp_dir}/ -mv bin/pam_winbind.so %{_32bit_tmp_dir}/ -mv bin/libtalloc.so* %{_32bit_tmp_dir}/ -mv bin/libtdb.so* %{_32bit_tmp_dir}/ -mv bin/libwbclient.so* %{_32bit_tmp_dir}/ - -make clean - -CC="$CC_SAVE" - -%endif - CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \ --prefix=%{_prefix} \ --localstatedir=/var \ @@ -335,20 +251,6 @@ install -m 755 nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_win cp -p source3/bin/winbind_krb5_locator.so ${RPM_BUILD_ROOT}/%{_libarchdir}/krb5/plugins/libkrb5 -# install files for winbind-32bit package -%ifarch x86_64 ppc64 - -install -m 755 %{_32bit_tmp_dir}/libnss_winbind.so ${RPM_BUILD_ROOT}/lib/libnss_winbind.so.2 -( cd ${RPM_BUILD_ROOT}/lib; ln -sf libnss_winbind.so.2 libnss_winbind.so ) - -mv %{_32bit_tmp_dir}/libtalloc* ${RPM_BUILD_ROOT}/usr/lib -mv %{_32bit_tmp_dir}/libtdb* ${RPM_BUILD_ROOT}/usr/lib -mv %{_32bit_tmp_dir}/libwbclient* ${RPM_BUILD_ROOT}/usr/lib -mv %{_32bit_tmp_dir}/pam_winbind.so ${RPM_BUILD_ROOT}/lib/security - -rm -rf %{_32bit_tmp_dir} - -%endif ## cleanup /bin/rm -rf $RPM_BUILD_ROOT/usr/lib*/samba/security @@ -665,19 +567,6 @@ exit 0 %{_mandir}/man7/winbind_krb5_locator.7* %{_mandir}/man8/idmap_*.8* -%ifarch x86_64 ppc64 -%files winbind-32bit -%attr(755,root,root) /lib/libnss_winbind.so -%attr(755,root,root) /lib/libnss_winbind.so.2 -%attr(755,root,root) /usr/lib/libtalloc.so -%attr(755,root,root) /usr/lib/libtalloc.so.2 -%attr(755,root,root) /usr/lib/libtdb.so -%attr(755,root,root) /usr/lib/libtdb.so.1 -%attr(755,root,root) /usr/lib/libwbclient.so -%attr(755,root,root) /usr/lib/libwbclient.so.0 -%attr(755,root,root) /lib/security/pam_winbind.so -%endif - %changelog |