diff options
Diffstat (limited to 'specs/pki-ra.spec')
| -rw-r--r-- | specs/pki-ra.spec | 54 |
1 files changed, 6 insertions, 48 deletions
diff --git a/specs/pki-ra.spec b/specs/pki-ra.spec index 0cff1af89..aa5b4516d 100644 --- a/specs/pki-ra.spec +++ b/specs/pki-ra.spec @@ -7,7 +7,7 @@ Name: pki-ra Version: 10.0.0 -Release: %{?relprefix}11%{?prerel}%{?dist} +Release: %{?relprefix}12%{?prerel}%{?dist} Summary: Certificate System - Registration Authority URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -17,12 +17,7 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# specify '_unitdir' macro for platforms that don't use 'systemd' -%if 0%{?rhel} || 0%{?fedora} < 16 -%define _unitdir /lib/systemd/system -%endif - -BuildRequires: cmake +BuildRequires: cmake >= 2.8.10.1-1 BuildRequires: nspr-devel BuildRequires: nss-devel @@ -34,17 +29,9 @@ Requires: pki-ra-theme >= 10.0.0 Requires: perl-DBD-SQLite Requires: sqlite Requires: /usr/sbin/sendmail -%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 -Requires: initscripts -%endif Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz @@ -133,7 +120,6 @@ chmod 755 %{buildroot}%{_datadir}/pki/ra/docroot/ee/scep/*.cgi chmod 755 %{buildroot}%{_datadir}/pki/ra/docroot/ee/server/*.cgi chmod 755 %{buildroot}%{_datadir}/pki/ra/docroot/ee/user/*.cgi -%if 0%{?fedora} >= 15 # Details: # # * https://fedoraproject.org/wiki/Features/var-run-tmpfs @@ -145,34 +131,9 @@ echo "D /var/lock/pki 0755 root root -" > %{buildroot}%{_sysconfdir}/tmpfile echo "D /var/lock/pki/ra 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-ra.conf echo "D /var/run/pki 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-ra.conf echo "D /var/run/pki/ra 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-ra.conf -%endif -%if 0%{?fedora} >= 16 %{__rm} %{buildroot}%{_initrddir}/pki-rad -%else -%{__rm} -rf %{buildroot}%{_sysconfdir}/systemd/system/pki-rad.target.wants -%{__rm} -rf %{buildroot}%{_unitdir} -%endif - -%if 0%{?rhel} || 0%{?fedora} < 16 -%post -# This adds the proper /etc/rc*.d links for the script -/sbin/chkconfig --add pki-rad || : - - -%preun -if [ $1 = 0 ] ; then - /sbin/service pki-rad stop >/dev/null 2>&1 - /sbin/chkconfig --del pki-rad || : -fi - -%postun -if [ "$1" -ge "1" ] ; then - /sbin/service pki-rad condrestart >/dev/null 2>&1 || : -fi - -%else %post # Attempt to update ALL old "RA" instances to "systemd" if [ -d /etc/sysconfig/pki/ra ]; then @@ -211,19 +172,14 @@ fi if [ "$1" -ge "1" ] ; then /bin/systemctl try-restart pki-rad.target >/dev/null 2>&1 || : fi -%endif %files %defattr(-,root,root,-) %doc base/ra/LICENSE -%if 0%{?fedora} >= 16 %dir %{_sysconfdir}/systemd/system/pki-rad.target.wants %{_unitdir}/pki-rad@.service %{_unitdir}/pki-rad.target -%else -%{_initrddir}/pki-rad -%endif %dir %{_datadir}/pki/ra %{_datadir}/pki/ra/conf/ %{_datadir}/pki/ra/docroot/ @@ -232,17 +188,19 @@ fi %{_datadir}/pki/ra/setup/ %dir %{_localstatedir}/lock/pki/ra %dir %{_localstatedir}/run/pki/ra -%if 0%{?fedora} >= 15 # Details: # # * https://fedoraproject.org/wiki/Features/var-run-tmpfs # * https://fedoraproject.org/wiki/Tmpfiles.d_packaging_draft # %config(noreplace) %{_sysconfdir}/tmpfiles.d/pki-ra.conf -%endif %changelog +* Tue Nov 20 2012 Ade Lee <alee@redhat.com> 10.0.0-0.12.b3 +- Update spec fiel to support fedora >= 17 and rhel 7+ +- Update cmake version + * Mon Nov 12 2012 Ade Lee <alee@redhat.com> 10.0.0-0.11.b3 - Update release to b3 |