diff options
| author | vakwetu <vakwetu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-09-09 20:42:46 +0000 |
|---|---|---|
| committer | vakwetu <vakwetu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-09-09 20:42:46 +0000 |
| commit | 78a301689d984401ad7098049ddb2f6e5504d957 (patch) | |
| tree | a5d9b21416785e6558300001a3c8dafece76c8a3 /pki/specs/pki-kra.spec | |
| parent | 4ee4f5ae0e627ab89499844f95f0bc4b8cd4cd2e (diff) | |
| download | pki-78a301689d984401ad7098049ddb2f6e5504d957.tar.gz pki-78a301689d984401ad7098049ddb2f6e5504d957.tar.xz pki-78a301689d984401ad7098049ddb2f6e5504d957.zip | |
Bugzilla BZ# 699809 - Convert certificate system to use systemd
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2196 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/specs/pki-kra.spec')
| -rw-r--r-- | pki/specs/pki-kra.spec | 45 |
1 files changed, 43 insertions, 2 deletions
diff --git a/pki/specs/pki-kra.spec b/pki/specs/pki-kra.spec index ea79c29f..ef8c2c43 100644 --- a/pki/specs/pki-kra.spec +++ b/pki/specs/pki-kra.spec @@ -1,5 +1,5 @@ Name: pki-kra -Version: 9.0.5 +Version: 9.0.6 Release: 1%{?dist} Summary: Certificate System - Data Recovery Manager URL: http://pki.fedoraproject.org/ @@ -18,15 +18,25 @@ BuildRequires: nspr-devel BuildRequires: nss-devel BuildRequires: pki-common BuildRequires: pki-util +%if 0%{?fedora} >= 16 +BuildRequires: systemd-units +%endif Requires: java >= 1:1.6.0 Requires: pki-common Requires: pki-kra-theme Requires: pki-selinux +%if 0%{?fedora} >= 16 +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units +%else Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts Requires(postun): initscripts +%endif + %if 0%{?fedora} >= 15 # Details: # @@ -117,7 +127,14 @@ echo "D /var/run/pki 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfil echo "D /var/run/pki/kra 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-kra.conf %endif +%if 0%{?fedora} >= 16 +%{__rm} %{buildroot}%{_initrddir}/pki-krad +%else +%{__rm} -rf %{buildroot}%{_sysconfdir}/systemd/system/pki-krad.target.wants +%{__rm} -rf %{buildroot}%{_unitdir} +%endif +%if 0%{?fedora} < 16 %post # This adds the proper /etc/rc*.d links for the script /sbin/chkconfig --add pki-krad || : @@ -134,12 +151,33 @@ fi if [ "$1" -ge "1" ] ; then /sbin/service pki-krad condrestart >/dev/null 2>&1 || : fi +%else +%post +/bin/systemctl daemon-reload >/dev/null 2>&1 || : + +%preun +if [ $1 = 0 ] ; then + /bin/systemctl --no-reload disable pki-krad.target > /dev/null 2>&1 || : + /bin/systemctl stop pki-krad.target > /dev/null 2>&1 || : +fi +%postun +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ "$1" -ge "1" ] ; then + /bin/systemctl try-restart pki-krad.target >/dev/null 2>&1 || : +fi +%endif %files %defattr(-,root,root,-) %doc base/kra/LICENSE -%{_initrddir}/pki-krad +%if 0%{?fedora} >= 16 +%dir %{_sysconfdir}/systemd/system/pki-krad.target.wants +%{_unitdir}/pki-krad@.service +%{_unitdir}/pki-krad.target +%else +%{_initrddir}/pki-cad +%endif %{_javadir}/pki/pki-kra-%{version}.jar %{_javadir}/pki/pki-kra.jar %dir %{_datadir}/pki/kra @@ -159,6 +197,9 @@ fi %changelog +* Tue Sep 6 2011 Ade Lee <alee@redhat.com> 9.0.6-1 +- Bugzilla Bug #699809 - Convert CS to use systemd (alee) + * Tue Aug 23 2011 Ade Lee <alee@redhat.com> 9.0.5-1 - Bugzilla Bug #712931 - CS requires too many ports to be open in the FW |