More changes to get samba4 built on Fedora 16:

- Remove tevent Python bindings in install section
- Make sure to use systemctl to talk with systemd

Account for UsrMove for Fedora 17 (thanks to Sumit Bose for the patch)

1 files changed, 32 insertions, 20 deletions

diff --git a/samba4.spec b/samba4.spec
index 622beb2..4ceadf8 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -14,12 +14,24 @@
 %define with_tevent 1
 %define with_ldb 1
 
+%define with_usrmove 0
+
 %if 0%{?fedora} > 15 || 0%{?rhel} > 6
 %define with_talloc 0
 %define with_tevent 0
 %define with_ldb 0
 %endif
 
+%if 0%{?fedora} > 16
+%define with_usrmove 1
+%endif
+
+%if %with_usrmove
+%define smb_lib %{_libdir}
+%else
+%define smb_lib %{_lib}
+%endif
+
 Name:           samba4
 Version:        %{samba_version}
 Release:        %{samba_release}
@@ -376,7 +388,7 @@ link against the SMB, RPC and other protocols.
         --with-piddir=/var/run \
         --with-sockets-dir=/var/run \
         --with-modulesdir=%{_libdir}/samba \
-        --with-pammodulesdir=/%{_lib}/security \
+        --with-pammodulesdir=/%{smb_lib}/security \
         --with-lockdir=/var/lib/samba \
         --disable-tdb2 \
         --disable-gnutls \
@@ -406,10 +418,9 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-install -d -m 0755 %{buildroot}/sbin
 install -d -m 0755 %{buildroot}/usr/{sbin,bin}
 install -d -m 0755 %{buildroot}/%{_sysconfdir}/{pam.d,logrotate.d,security}
-install -d -m 0755 %{buildroot}/%{_lib}/security
+install -d -m 0755 %{buildroot}/%{smb_lib}/security
 install -d -m 0755 %{buildroot}/var/lib/samba
 install -d -m 0755 %{buildroot}/var/lib/samba/private
 install -d -m 0755 %{buildroot}/var/lib/samba/winbindd_privileged
@@ -430,14 +441,16 @@ rm -rf %{buildroot}/%{_datadir}/perl5
 ( cd pidl && make install PERL_INSTALL_ROOT=%{buildroot} )
 
 # winbind
+%if ! %with_usrmove
 install -d -m 0755 %{buildroot}%{_libdir}
-install -d -m 0755 %{buildroot}/%{_lib}
-mv -f %{buildroot}/%{_libdir}/libnss_winbind.so.2 %{buildroot}/%{_lib}/libnss_winbind.so.2
-chmod 0755 %{buildroot}/%{_lib}/libnss_winbind.so.2
-ln -sf /%{_lib}/libnss_winbind.so.2  %{buildroot}%{_libdir}/libnss_winbind.so
-mv -f %{buildroot}/%{_libdir}/libnss_wins.so.2 %{buildroot}/%{_lib}/libnss_wins.so.2
-chmod 0755 %{buildroot}/%{_lib}/libnss_wins.so.2
-ln -sf /%{_lib}/libnss_wins.so.2  %{buildroot}%{_libdir}/libnss_wins.so
+install -d -m 0755 %{buildroot}/%{smb_lib}
+mv -f %{buildroot}/%{_libdir}/libnss_winbind.so.2 %{buildroot}/%{smb_lib}/libnss_winbind.so.2
+chmod 0755 %{buildroot}/%{smb_lib}/libnss_winbind.so.2
+mv -f %{buildroot}/%{_libdir}/libnss_wins.so.2 %{buildroot}/%{smb_lib}/libnss_wins.so.2
+chmod 0755 %{buildroot}/%{smb_lib}/libnss_wins.so.2
+%endif
+ln -sf /%{smb_lib}/libnss_winbind.so.2  %{buildroot}%{_libdir}/libnss_winbind.so
+ln -sf /%{smb_lib}/libnss_wins.so.2  %{buildroot}%{_libdir}/libnss_wins.so
 
 # pdb FIXME
 ln -sf %{_libdir}/samba/libpdb.so.0  %{buildroot}%{_libdir}/samba/libpdb.so
@@ -495,7 +508,8 @@ find %{buildroot}%{_libdir} -name '*.so*' -type f |xargs chmod +x
 find source4/heimdal -type f | xargs chmod -x
 
 # Remove stuff the buildsystem did not handle correctly
-rm -f %{buildroot}/%{_lib}/security/pam_smbpass.so
+rm -f %{buildroot}/%{smb_lib}/security/pam_smbpass.so
+rm -f %{buildroot}%{python_sitelib}/tevent.py
 
 %post
 if [ $1 -eq 1 ] ; then
@@ -532,16 +546,14 @@ fi
 /usr/sbin/groupadd -g 88 wbpriv >/dev/null 2>&1 || :
 
 %post winbind
-/sbin/chkconfig --add winbind
-
 if [ "$1" -ge "1" ]; then
-    /sbin/service winbind condrestart >/dev/null 2>&1 || :
+    /bin/systemctl try-restart winbind.service >/dev/null 2>&1 || :
 fi
 
 %preun winbind
 if [ $1 = 0 ] ; then
-    /sbin/service winbind stop >/dev/null 2>&1 || :
-    /sbin/chkconfig --del winbind
+    /bin/systemctl stop winbind.service >/dev/null 2>&1 || :
+    /bin/systemctl disable winbind.service
 fi
 exit 0
 
@@ -711,7 +723,7 @@ rm -rf %{buildroot}
 %{_libdir}/samba/pdb
 
 %if %with_pam_smbpass
-/%{_lib}/security/pam_smbpass.so
+/%{smb_lib}/security/pam_smbpass.so
 %endif
 
 %files dc
@@ -778,10 +790,10 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %{_bindir}/wbinfo
 %{_libdir}/libnss_winbind.so
-/%{_lib}/libnss_winbind.so.2
+/%{smb_lib}/libnss_winbind.so.2
 %{_libdir}/libnss_wins.so
-/%{_lib}/libnss_wins.so.2
-/%{_lib}/security/pam_winbind.so
+/%{smb_lib}/libnss_wins.so.2
+/%{smb_lib}/security/pam_winbind.so
 
 %files client
 %defattr(-,root,root)