[gridengine] Fix conditionals for rhel7
Orion Poplawski
orion at fedoraproject.org
Tue Mar 3 23:51:25 UTC 2015
commit 23e6ccca5ec173c30f476c3eb50013887a3e8426
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Tue Mar 3 16:51:24 2015 -0700
Fix conditionals for rhel7
gridengine.spec | 98 ++++++++++-----------------------------------------------
1 file changed, 17 insertions(+), 81 deletions(-)
---
diff --git a/gridengine.spec b/gridengine.spec
index c56ce27..4b7483b 100644
--- a/gridengine.spec
+++ b/gridengine.spec
@@ -27,7 +27,7 @@ Source1: gridengine-ppc.tar.gz
Source2: conf_defaults
Source3: sge.csh
Source4: sge.sh
-%if 0%{?fedora} >= 15
+%if 0%{?fedora} || 0%{?rhel} >= 7
Source5: sge_execd.service
Source6: sgemaster.service
Source13: sge_shadowd.service
@@ -73,23 +73,19 @@ BuildRequires: openmotif-devel
BuildRequires: lesstif-devel
%endif
BuildRequires: java-devel >= 1.6.0, javacc, ant-junit
-%if 0%{?rhel}
+%if 0%{?rhel} <= 6
BuildRequires: ant-nodeps
%endif
BuildRequires: elfutils-libelf-devel, net-tools
BuildRequires: groff
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 7
BuildRequires: hostname
%endif
BuildRequires: hwloc-devel
BuildRequires: jemalloc-devel
-%if 0%{?fedora}
-%if 0%{?fedora} >= 18
-BuildRequires: systemd-units
-%else
+%if 0%{?fedora} || 0%{?rhel} >= 7
BuildRequires: systemd
%endif
-%endif
Requires: binutils
Requires: ncurses
Requires(posttrans): /usr/sbin/alternatives
@@ -142,18 +138,11 @@ Summary: Gridengine execd program
Group: Development/Libraries
License: BSD and LGPLv2+ and MIT and SISSL
Requires: %{name} = %{version}-%{release}
-%if 0%{?fedora}
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} || 0%{?rhel} >= 7
Requires(post): systemd
Requires(postun): systemd
Requires(preun): systemd
%else
-Requires(post): systemd-units
-Requires(post): systemd-sysv
-Requires(postun): systemd-units
-Requires(preun): systemd-units
-%endif
-%else
Requires(post): /sbin/chkconfig
Requires(postun): /sbin/service
Requires(preun): /sbin/chkconfig
@@ -172,18 +161,11 @@ Group: Development/Libraries
License: BSD and LGPLv2+ and MIT and SISSL
Requires: %{name} = %{version}-%{release}
Requires: db4-utils
-%if 0%{?fedora}
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} || 0%{?rhel} >= 7
Requires(post): systemd
Requires(postun): systemd
Requires(preun): systemd
%else
-Requires(post): systemd-units
-Requires(post): systemd-sysv
-Requires(postun): systemd-units
-Requires(preun): systemd-units
-%endif
-%else
Requires(post): /sbin/chkconfig
Requires(postun): /sbin/service
Requires(preun): /sbin/chkconfig
@@ -243,7 +225,7 @@ cd source
cat > aimk.private <<EOF
set OPENSSL_HOME = /usr
set BERKELEYDB_HOME = /usr
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} || 0%{?rhel} >= 7
set BDB_INCLUDE_SUBDIR = libdb4
set BDB_LIB_SUBDIR = ../%{_lib}/libdb4
%else
@@ -398,7 +380,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
install -p -m644 %SOURCE3 %SOURCE4 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
# Startup scripts
-%if 0%{?fedora} >= 15
+%if 0%{?fedora} || 0%{?rhel} >= 7
mkdir -p $RPM_BUILD_ROOT%{_unitdir}
install -p -m644 %SOURCE5 %SOURCE6 %SOURCE13 $RPM_BUILD_ROOT%{_unitdir}
%else
@@ -486,32 +468,17 @@ fi
%post execd
-%if 0%{?fedora}
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} || 0%{?rhel} >= 7
%systemd_post sge_execd.service
%else
-if [ $1 -eq 1 ] ; then
- # Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
-%endif
-%else
/sbin/chkconfig --add sge_execd
%endif
%postun execd
-%if 0%{?fedora}
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} || 0%{?rhel} >= 7
%systemd_postun_with_restart sge_execd.service
%else
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
- /bin/systemctl try-restart sge_execd.service >/dev/null 2>&1 || :
-fi
-%endif
-%else
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
/sbin/service sge_execd condrestart >/dev/null 2>&1 || :
@@ -519,25 +486,17 @@ fi
%endif
%preun execd
-%if 0%{?fedora}
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} || 0%{?rhel} >= 7
%systemd_preun sge_execd.service
%else
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
- /bin/systemctl --no-reload disable sge_execd.service > /dev/null 2>&1 || :
- /bin/systemctl stop sge_execd.service > /dev/null 2>&1 || :
-fi
-%endif
-%else
-if [ $1 -eq 0 ] ; then
- # Package removal, not upgrade
/sbin/service sge_execd stop
/sbin/chkconfig --del sge_execd
fi
%endif
-%if 0%{?fedora} >= 15
+%if 0%{?fedora} || 0%{?rhel} >= 7
%triggerun -- gridengine-execd < 6.2u5p2-2
/usr/bin/systemd-sysv-convert --save sge_execd >/dev/null 2>&1 || :
/sbin/chkconfig --del sge_execd >/dev/null 2>&1 || :
@@ -545,33 +504,18 @@ fi
%endif
%post qmaster
-%if 0%{?fedora}
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} || 0%{?rhel} >= 7
%systemd_post sgemaster.service
%systemd_post sge_shadowd.service
%else
-if [ $1 -eq 1 ] ; then
- # Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
-%endif
-%else
/sbin/chkconfig --add sgemaster
%endif
%postun qmaster
-%if 0%{?fedora}
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} || 0%{?rhel} >= 7
%systemd_postun_with_restart sgemaster.service
%systemd_postun_with_restart sge_shadowd.service
%else
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
- /bin/systemctl try-restart sgemaster.service >/dev/null 2>&1 || :
-fi
-%endif
-%else
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
/sbin/service sgemaster condrestart >/dev/null 2>&1 || :
@@ -579,20 +523,12 @@ fi
%endif
%preun qmaster
-%if 0%{?fedora}
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} || 0%{?rhel} >= 7
%systemd_preun sgemaster.service
%systemd_preun sge_shadowd.service
%else
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
- /bin/systemctl --no-reload disable sgemaster.service > /dev/null 2>&1 || :
- /bin/systemctl stop sgemaster.service > /dev/null 2>&1 || :
-fi
-%endif
-%else
-if [ $1 -eq 0 ] ; then
- # Package removal, not upgrade
/sbin/service sgemaster stop
/sbin/chkconfig --del sgemaster
fi
@@ -671,7 +607,7 @@ fi
%{_mandir}/man1/qmon.1*
%files execd
-%if 0%{?fedora} >= 15
+%if 0%{?fedora} || 0%{?rhel} >= 7
%{_unitdir}/sge_execd.service
%else
%{_initrddir}/sge_execd
@@ -685,7 +621,7 @@ fi
%{_mandir}/man8/sge_*shepherd.8*
%files qmaster
-%if 0%{?fedora} >= 15
+%if 0%{?fedora} || 0%{?rhel} >= 7
%{_unitdir}/sgemaster.service
%{_unitdir}/sge_shadowd.service
%else
More information about the scm-commits
mailing list