summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2010-10-13 09:38:22 -0400
committerStephen Gallagher <sgallagh@redhat.com>2010-10-13 14:16:57 -0400
commit936647bf729d258db9f381b561c7b18780ff70ab (patch)
tree75bc8dc8283e016e1df2da37cf852d95b4e3989f
parent15b266d9f14dad26da8678a79019749d0f69532e (diff)
downloadsssd-936647bf729d258db9f381b561c7b18780ff70ab.tar.gz
sssd-936647bf729d258db9f381b561c7b18780ff70ab.tar.bz2
sssd-936647bf729d258db9f381b561c7b18780ff70ab.zip
Assorted specfile changes
Several problems with the specfile were fixed in the SSSD release in certain RPM-based distributions. This patch pulls them into the example specfile
-rw-r--r--contrib/sssd.spec.in18
1 files changed, 10 insertions, 8 deletions
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 59fc132e..6416128c 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -22,9 +22,9 @@ Requires: libtdb >= 1.1.3
Requires: sssd-client = %{version}-%{release}
Requires: cyrus-sasl-gssapi
Requires: keyutils-libs
-Requires(post): python
+Requires(post): initscripts chkconfig /sbin/ldconfig
Requires(preun): initscripts chkconfig
-Requires(postun): /sbin/service
+Requires(postun): initscripts chkconfig /sbin/ldconfig
%global servicename sssd
%global sssdstatedir %{_localstatedir}/lib/sss
@@ -49,7 +49,7 @@ BuildRequires: libtalloc-devel
BuildRequires: libtevent-devel
BuildRequires: libtdb-devel
BuildRequires: libldb-devel
-BuildRequires: libdhash-devel
+BuildRequires: libdhash-devel >= 0.4.2
BuildRequires: libcollection-devel
BuildRequires: libini_config-devel
BuildRequires: dbus-devel
@@ -107,7 +107,9 @@ service.
make %{?_smp_mflags}
%check
+export CK_TIMEOUT_MULTIPLIER=10
make %{?_smp_mflags} check
+unset CK_TIMEOUT_MULTIPLIER
%install
rm -rf $RPM_BUILD_ROOT
@@ -213,17 +215,17 @@ rm -rf $RPM_BUILD_ROOT
/sbin/ldconfig
/sbin/chkconfig --add %{servicename}
+if [ $1 -ge 1 ] ; then
+ /sbin/service %{servicename} condrestart 2>&1 > /dev/null
+fi
+
%preun
if [ $1 = 0 ]; then
/sbin/service %{servicename} stop 2>&1 > /dev/null
/sbin/chkconfig --del %{servicename}
fi
-%postun
-/sbin/ldconfig
-if [ $1 -ge 1 ] ; then
- /sbin/service %{servicename} condrestart 2>&1 > /dev/null
-fi
+%postun -p /sbin/ldconfig
%post client -p /sbin/ldconfig