The branch, v3-5-test has been updated via 4efc4fc s3/packaging: Fix rpm build issues on RHEL4. via 3862b12 s3/packaging: Fix rpm build issues on RHEL. from 2bdf872 s3:libsmb: consistently use state->size in cli_write_andx_create() (bug #5326)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log ----------------------------------------------------------------- commit 4efc4fc9a77fe94a9513bcbfc3a24878783ee3f1 Author: Karolin Seeger <ksee...@samba.org> Date: Thu Nov 17 21:23:09 2011 +0100 s3/packaging: Fix rpm build issues on RHEL4. Second part of a fix for bug #7705 (RHEL samba.spec broken - and fix). Based on patches of Jason Haar and Daniël van Eeden. Thanks a lot! Karolin Autobuild-User: Karolin Seeger <ksee...@samba.org> Autobuild-Date: Fri Nov 18 22:13:06 CET 2011 on sn-devel-104 (cherry picked from commit 1d471ee393b0a0c1f9cc4256217acabcd98a5dbf) (cherry picked from commit b0e5fb69df8b66544afc29d0b3dac5454d04fe3e) commit 3862b127bae80ed62a3a6c2ca4e43a7f58623d5b Author: Karolin Seeger <ksee...@samba.org> Date: Thu Nov 17 21:02:30 2011 +0100 s3/packaging: Fix rpm build issues on RHEL. Fix bug #7705 (RHEL samba.spec broken - and fix). Based on patches of Jason Haar and Daniël van Eeden. Thanks a lot! Karolin Autobuild-User: Karolin Seeger <ksee...@samba.org> Autobuild-Date: Thu Nov 17 23:05:28 CET 2011 on sn-devel-104 (cherry picked from commit 32e825d60df26fa1d4cf5c8c7cb37ca0523847ca) (cherry picked from commit f89cdef51633402006dcad17b49e596a41905a40) ----------------------------------------------------------------------- Summary of changes: packaging/RHEL/samba.spec.tmpl | 43 ++++++++++++++++----------------------- 1 files changed, 18 insertions(+), 25 deletions(-) Changeset truncated at 500 lines: diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl index ab10f23..152bad7 100644 --- a/packaging/RHEL/samba.spec.tmpl +++ b/packaging/RHEL/samba.spec.tmpl @@ -1,5 +1,11 @@ %define initdir %{_sysconfdir}/rc.d/init.d %define auth %(test -f /etc/pam.d/system-auth && echo /etc/pam.d/system-auth || echo) +%define this_is_redhat %(test -e /etc/redhat-release && echo 1 || echo 0) +%if %{this_is_redhat} > 0 +%define rhel_ver %(lsb_release -sr) +%else +%define rhel_ver 0 +%endif Summary: Samba SMB client and server Vendor: Samba Team @@ -28,7 +34,13 @@ Provides: samba = %{version} Prefix: /usr BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel, keyutils-devel +BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel + +%if %{rhel_ver} > 4 +BuildRequires: keyutils-libs-devel +%else +BuildRequires: keyutils-devel +%endif # Working around perl dependency problem from docs %define __perl_requires %{SOURCE998} @@ -233,12 +245,8 @@ 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 source3/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs -install -m755 source3/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs install -m755 source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir} -/bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs - ln -s ../..%{initdir}/smb $RPM_BUILD_ROOT%{_sbindir}/samba ln -s ../..%{initdir}/winbind $RPM_BUILD_ROOT%{_sbindir}/winbind @@ -331,9 +339,11 @@ fi %{_bindir}/mksmbpasswd.sh %{_bindir}/smbcontrol %{_bindir}/smbstatus +%{_bindir}/smbta-util %{_bindir}/tdbbackup %{_bindir}/tdbtool %{_bindir}/tdbdump +%{_bindir}/tdbrestore %{_bindir}/wbinfo %{_bindir}/ntlm_auth %{_bindir}/pdbedit @@ -392,9 +402,6 @@ fi %files client %defattr(-,root,root) -/sbin/mount.cifs -/sbin/umount.cifs -%{_sbindir}/cifs.upcall %{_bindir}/rpcclient %{_bindir}/smbcacls @@ -410,9 +417,6 @@ fi %{_bindir}/net %{_bindir}/smbtree -%{_mandir}/man8/mount.cifs.8.* -%{_mandir}/man8/umount.cifs.8.* -%{_mandir}/man8/cifs.upcall.8.* %{_mandir}/man8/smbspool.8* %{_mandir}/man1/smbget.1* %{_mandir}/man5/smbgetrc.5* @@ -441,6 +445,7 @@ fi %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 +/usr/share/locale/de/LC_MESSAGES/net.mo /usr/share/locale/de/LC_MESSAGES/pam_winbind.mo /usr/share/locale/ar/LC_MESSAGES/pam_winbind.mo /usr/share/locale/cs/LC_MESSAGES/pam_winbind.mo @@ -483,28 +488,16 @@ fi %{_bindir}/smbpasswd %{_bindir}/profiles -%{_bindir}/ldbadd -%{_bindir}/ldbdel -%{_bindir}/ldbedit -%{_bindir}/ldbmodify -%{_bindir}/ldbrename -%{_bindir}/ldbsearch - %{_mandir}/man1/profiles.1* %{_mandir}/man1/testparm.1* %{_mandir}/man5/smb.conf.5* %{_mandir}/man5/lmhosts.5* %{_mandir}/man8/smbpasswd.8* +%{_mandir}/man5/pam_winbind.conf.5.* %{_mandir}/man7/libsmbclient.7* +%{_mandir}/man8/smbta-util.8* %{_mandir}/man8/pam_winbind.8* -%{_mandir}/man1/ldbadd.1* -%{_mandir}/man1/ldbdel.1* -%{_mandir}/man1/ldbedit.1* -%{_mandir}/man1/ldbmodify.1* -%{_mandir}/man1/ldbrename.1* -%{_mandir}/man1/ldbsearch.1* - %changelog * Fri Jan 16 2004 Gerald (Jerry) Carter <jerry@samba,org> - Removed ChangeLog entries since they are kept in CVS -- Samba Shared Repository