[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-3014-gd63cd75
Michael Adam
obnox at samba.org
Thu Sep 11 10:54:12 GMT 2008
The branch, v3-2-test has been updated
via d63cd755220aba591709917c729e028a913bec5d (commit)
via fe8448fe8f7ee0d33631366503163d3b2ee3eded (commit)
via 08b43cbd04cf8894e91f1182b222f8dd1c90659d (commit)
via e97c52d38424c45b34e5d3b5dc2f4b2b3a1b9b31 (commit)
via cf13475d4d5cfe968d694d49b8fd0f6020c5a9d8 (commit)
from c22bf57329f16a45eb0954b72f8083270f6535e7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit d63cd755220aba591709917c729e028a913bec5d
Author: Michael Adam <obnox at samba.org>
Date: Wed Sep 10 23:31:26 2008 +0200
packaging(RHEL): fix direction of link (.so) of nss libs.
libnss_winbindd.so -> libnss_winbindd.so.2
libnss_wins.so -> libnss_wins.so.2
Michael
commit fe8448fe8f7ee0d33631366503163d3b2ee3eded
Author: Michael Adam <obnox at samba.org>
Date: Wed Sep 10 13:48:13 2008 +0200
packaging(RHEL): workaround all library installations by mv to %{_libarchdir}
This is all that is still necessary in 3.2.3+.
(The eloquent workarounds for libsmbclient and libsmbsharemodes
are removed.)
In 3.3.0, with the separation of libdir and modulesdir, even this
step becomes unnecessary.
Michael
commit 08b43cbd04cf8894e91f1182b222f8dd1c90659d
Author: Michael Adam <obnox at samba.org>
Date: Wed Sep 10 13:46:07 2008 +0200
packaging(RHEL): remove even another manual installation of pam_smbpass.so
Michael
commit e97c52d38424c45b34e5d3b5dc2f4b2b3a1b9b31
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 8 15:51:33 2008 +0200
packaging(RHEL): fix installation of pam modules.
Michael
commit cf13475d4d5cfe968d694d49b8fd0f6020c5a9d8
Author: Michael Adam <obnox at samba.org>
Date: Fri Aug 29 16:55:55 2008 +0200
packaging(RHEL): fix libdir installation by using _libarch/_libarchdir
Michael
-----------------------------------------------------------------------
Summary of changes:
packaging/RHEL/samba.spec.tmpl | 87 ++++++++++++++++++++-------------------
1 files changed, 45 insertions(+), 42 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 8c34a4a..49a0109 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -33,6 +33,15 @@ BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-deve
# Working around perl dependency problem from docs
%define __perl_requires %{SOURCE998}
+# rpm screws up the arch lib dir when using --target on RHEL5
+%ifarch i386 i486 i586 i686 ppc s390
+%define _libarch lib
+%else
+%define _libarch %_lib
+%endif
+
+%define _libarchdir /usr/%{_libarch}
+
%description
Samba is the protocol by which a lot of PC-related machines share
@@ -127,7 +136,8 @@ CC="$CC" CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
--prefix=%{_prefix} \
--localstatedir=/var \
--with-configdir=%{_sysconfdir}/samba \
- --with-libdir=%{_libdir}/samba \
+ --with-libdir=%{_libarchdir}/samba \
+ --with-pammodulesdir=%{_libarch}/security \
--with-lockdir=/var/lib/samba \
--with-logfilebase=/var/log/samba \
--with-mandir=%{_mandir} \
@@ -187,9 +197,9 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/swat/{help,include,using_samba/{figs,gifsa}}
mkdir -p $RPM_BUILD_ROOT%{_includedir}
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-mkdir -p $RPM_BUILD_ROOT{%{_libdir},%{_includedir}}
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/samba/{auth,charset,idmap,vfs,pdb}
-mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
+mkdir -p $RPM_BUILD_ROOT{%{_libarchdir},%{_includedir}}
+mkdir -p $RPM_BUILD_ROOT%{_libarchdir}/samba/{auth,charset,idmap,vfs,pdb}
+mkdir -p $RPM_BUILD_ROOT/%{_libarch}/security
mkdir -p $RPM_BUILD_ROOT%{_mandir}
mkdir -p $RPM_BUILD_ROOT%{_prefix}/{bin,sbin}
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
@@ -207,31 +217,24 @@ make DESTDIR=$RPM_BUILD_ROOT \
install
cd ..
-# NSS & PAM winbind support
-install -m 755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so
-install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so
-install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_lib}/libnss_wins.so
-( cd $RPM_BUILD_ROOT/%{_lib};
- ln -sf libnss_winbind.so libnss_winbind.so.2;
- ln -sf libnss_wins.so libnss_wins.so.2 )
-
-# make install puts libsmbclient.so in the wrong place on x86_64
-rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libsmbclient.so $RPM_BUILD_ROOT/usr/lib*/samba/libsmbclient.a || true
-install -m 755 source/bin/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so
-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
-
-# make install puts libsmbsharemodes.so in the wrong place on x86_64
-rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.so $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.a || true
-install -m 755 source/bin/libsmbsharemodes.so $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so
-install -m 755 source/bin/libsmbsharemodes.a $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.a
-install -m 644 source/include/smb_share_modes.h $RPM_BUILD_ROOT%{_includedir}
-rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libsmbsharemodes.*
-ln -s /%{_libdir}/libsmbsharemodes.so $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so.0
-
-# Install pam_smbpass.so
-install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
+# NSS winbind support
+install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2
+install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so.2
+( cd $RPM_BUILD_ROOT/%{_libarch};
+ ln -sf libnss_winbind.so.2 libnss_winbind.so;
+ ln -sf libnss_wins.so.2 libnss_wins.so )
+
+# Put the shared (and possibly static) libraries into /usr/lib{,64}/ .
+# Samba 3.2.2 installs them into /usr/lib{,64}/samba/ .
+# This step will become unnecessary in 3.3.0.
+#
+for library in libsmbclient libsmbsharemodes libwbclient libtalloc libtdb
+libnetapi
+do
+ mv -f ${RPM_BUILD_ROOT}%{_libarchdir}/samba/${library}.* \
+ ${RPM_BUILD_ROOT}%{_libarchdir}/
+done
+
## cleanup
/bin/rm -rf $RPM_BUILD_ROOT/usr/lib*/samba/security
@@ -354,10 +357,10 @@ fi
%{_bindir}/pdbedit
%{_bindir}/eventlogadm
-%{_libdir}/samba/idmap/*.so
-%{_libdir}/samba/nss_info/*.so
-%{_libdir}/samba/vfs/*.so
-%{_libdir}/samba/auth/*.so
+%{_libarchdir}/samba/idmap/*.so
+%{_libarchdir}/samba/nss_info/*.so
+%{_libarchdir}/samba/vfs/*.so
+%{_libarchdir}/samba/auth/*.so
%{_mandir}/man1/smbcontrol.1*
%{_mandir}/man1/smbstatus.1*
@@ -447,19 +450,19 @@ fi
%config(noreplace) %{_sysconfdir}/samba/smb.conf
%config(noreplace) %{_sysconfdir}/samba/lmhosts
-%attr(755,root,root) /%{_lib}/libnss_wins.so*
-%attr(755,root,root) /%{_lib}/libnss_winbind.so*
-%attr(755,root,root) /%{_lib}/security/pam_winbind.so
-%attr(755,root,root) /%{_lib}/security/pam_smbpass.so
+%attr(755,root,root) /%{_libarch}/libnss_wins.so*
+%attr(755,root,root) /%{_libarch}/libnss_winbind.so*
+%attr(755,root,root) /%{_libarch}/security/pam_winbind.so
+%attr(755,root,root) /%{_libarch}/security/pam_smbpass.so
%{_includedir}/libsmbclient.h
-%{_libdir}/libsmbclient.*
+%{_libarchdir}/libsmbclient.*
%{_includedir}/smb_share_modes.h
-%{_libdir}/libsmbsharemodes.*
+%{_libarchdir}/libsmbsharemodes.*
-%{_libdir}/samba/*.dat
-%{_libdir}/samba/*.msg
-%{_libdir}/samba/charset/*.so
+%{_libarchdir}/samba/*.dat
+%{_libarchdir}/samba/*.msg
+%{_libarchdir}/samba/charset/*.so
%{_includedir}/netapi.h
%{_includedir}/wbclient.h
--
Samba Shared Repository
More information about the samba-cvs
mailing list