[samba4] Fix ldonfig and require systemd for samba-common package.
asn
asn at fedoraproject.org
Thu Jun 21 15:07:12 UTC 2012
commit 463916c6be8197e1de9019ae6701a836bb82d83d
Author: Andreas Schneider <asn at cryptomilk.org>
Date: Thu Jun 21 17:06:31 2012 +0200
Fix ldonfig and require systemd for samba-common package.
samba4.spec | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
---
diff --git a/samba4.spec b/samba4.spec
index abfbbcf..aaad654 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -1,4 +1,4 @@
-%define main_release 56
+%define main_release 57
%define samba_version 4.0.0
%define talloc_version 2.0.7
@@ -224,6 +224,7 @@ and Wireshark to parse IDL and similar protocols
Summary: Files used by both Samba servers and clients
Group: Applications/System
Requires: %{name}-libs = %{samba_depver}
+Requires(post): systemd
Conflicts: samba-common < 2:3.9.9
Provides: samba-common = %{samba_depver}
@@ -542,7 +543,7 @@ rm -rf %{buildroot}%{perl_vendorlib}/Parse/Yapp
# This makes the right links, as rpmlint requires that
# the ldconfig-created links be recorded in the RPM.
-/usr/sbin/ldconfig -N -n %{buildroot}%{_libdir}
+/sbin/ldconfig -N -n %{buildroot}%{_libdir}
# Fix up permission on perl install.
%{_fixperms} %{buildroot}%{perl_vendorlib}
@@ -600,19 +601,19 @@ if [ $1 -ge 1 ] ; then
fi
%endif
-%post libs -p /usr/sbin/ldconfig
+%post libs -p /sbin/ldconfig
-%postun libs -p /usr/sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%if %with_dc
-%post dc-libs -p /usr/sbin/ldconfig
+%post dc-libs -p /sbin/ldconfig
-%postun dc-libs -p /usr/sbin/ldconfig
+%postun dc-libs -p /sbin/ldconfig
%endif # with_dc
-%post test -p /usr/sbin/ldconfig
+%post test -p /sbin/ldconfig
-%postun test -p /usr/sbin/ldconfig
+%postun test -p /sbin/ldconfig
%pre winbind
/usr/sbin/groupadd -g 88 wbpriv >/dev/null 2>&1 || :
@@ -646,25 +647,25 @@ fi
exit 0
%post common
-/usr/sbin/ldconfig
+/sbin/ldconfig
/usr/bin/systemd-tmpfiles --create %{_sysconfdir}/tmpfiles.d/samba.conf
-%postun common -p /usr/sbin/ldconfig
+%postun common -p /sbin/ldconfig
-%post winbind-clients -p /usr/sbin/ldconfig
+%post winbind-clients -p /sbin/ldconfig
-%postun winbind-clients -p /usr/sbin/ldconfig
+%postun winbind-clients -p /sbin/ldconfig
%if %with_libsmbclient
-%post -n libsmbclient -p /usr/sbin/ldconfig
+%post -n libsmbclient -p /sbin/ldconfig
-%postun -n libsmbclient -p /usr/sbin/ldconfig
+%postun -n libsmbclient -p /sbin/ldconfig
%endif # with_libsmbclient
%if %with_libwbclient
-%post -n libwbclient -p /usr/sbin/ldconfig
+%post -n libwbclient -p /sbin/ldconfig
-%postun -n libwbclient -p /usr/sbin/ldconfig
+%postun -n libwbclient -p /sbin/ldconfig
%endif # with_libwbclient
%clean
@@ -1269,6 +1270,10 @@ rm -rf %{buildroot}
%endif # with_libwbclient
%changelog
+* Thu Jun 21 2012 Andreas Schneider <asn at redhat.com> - 2:4.0.0-57.beta2
+- Fix ldonfig.
+- Require systemd for samba-common package.
+
* Thu Jun 21 2012 Andreas Schneider <asn at redhat.com> - 2:4.0.0-56.beta2
- Update to Samba 4.0.0 beta2.
More information about the scm-commits
mailing list