From 47b010d1e1d0e8bdbbcad73d5aedc19719d5d96a Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Sat, 5 Nov 2011 11:24:43 -0400 Subject: [PATCH] redhat: make rpms build on pre-f15 again we don't have systemd everywhere. don't assume it Change-Id: I4038bc1e1aff804e685d1987e368f2be1af35b05 Reviewed-on: http://gerrit.openafs.org/5813 Tested-by: BuildBot Reviewed-by: Simon Wilkinson Tested-by: Simon Wilkinson Reviewed-by: Derrick Brashear --- src/packaging/RedHat/openafs.spec.in | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in index f09d5d5..3f2f7bf 100644 --- a/src/packaging/RedHat/openafs.spec.in +++ b/src/packaging/RedHat/openafs.spec.in @@ -224,7 +224,10 @@ URL: http://www.openafs.org BuildRoot: %{_tmppath}/%{name}-%{version}-root Packager: OpenAFS Gatekeepers Group: Networking/Filesystems -BuildRequires: %{?kdepend:%{kdepend}, } pam-devel, ncurses-devel, flex, bison, systemd-units +BuildRequires: %{?kdepend:%{kdepend}, } pam-devel, ncurses-devel, flex, bison +%if 0%{?fedora} >= 15 +BuildRequires: systemd-units +%endif BuildRequires: perl-devel perl-ExtUtils-Embed %if %{krb5support} BuildRequires: krb5-devel @@ -1384,6 +1387,7 @@ if [ $1 -eq 0 ] ; then fi %endif +%if 0%{?fedora} >= 15 %postun client /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ $1 -ge 1 ] ; then @@ -1397,6 +1401,7 @@ if [ $1 -ge 1 ] ; then # Package upgrade, not uninstall /bin/systemctl try-restart openafs-server.service >/dev/null 2>&1 || : fi +%endif %if %{build_dkmspkg} %post -n dkms-%{name} @@ -1454,6 +1459,7 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||: %endif %endif +%if 0%{?fedora} >= 15 %triggerun -- openafs-client < 1.6.0-1 # Save the current service runlevel info # User must manually run systemd-sysv-convert --apply httpd @@ -1479,6 +1485,7 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||: # Run these because the SysV package being removed won't do them /sbin/chkconfig --del openafs-server >/dev/null 2>&1 || : /bin/systemctl try-restart openafs-server.service >/dev/null 2>&1 || : +%endif ############################################################################## ### -- 1.9.4