[pki-ra/f18] Release Candidate 1

[Ade Lee]

commit 4a00a4a5f900a70caf6201f3961157cb1402e4f3
Author: Ade Lee <alee at redhat.com>
Date:   Fri Dec 7 17:47:11 2012 -0500

    Release Candidate 1

 .gitignore  |    1 +
 pki-ra.spec |   64 ++++++++--------------------------------------------------
 sources     |    2 +-
 3 files changed, 11 insertions(+), 56 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2244bc3..e9c7b2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ pki-ra-1.3.1.tar.gz
 /pki-ra-10.0.0.b1.tar.gz
 /pki-ra-10.0.0.b2.tar.gz
 /pki-ra-10.0.0.b3.tar.gz
+/pki-ra-10.0.0.tar.gz
diff --git a/pki-ra.spec b/pki-ra.spec
index 0cff1af..64de4ce 100644
--- a/pki-ra.spec
+++ b/pki-ra.spec
@@ -1,13 +1,6 @@
-# for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release
-# also remove the space between % and global - this space is needed because
-# fedpkg verrel stupidly ignores comment lines
-%global prerel .b3
-# also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
-%global relprefix 0.
-
 Name:             pki-ra
 Version:          10.0.0
-Release:          %{?relprefix}11%{?prerel}%{?dist}
+Release:          1%{?dist}
 Summary:          Certificate System - Registration Authority
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -17,12 +10,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.9-1
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
 
@@ -34,17 +22,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 +113,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 +124,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 +165,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 at .service
 %{_unitdir}/pki-rad.target
-%else
-%{_initrddir}/pki-rad
-%endif
 %dir %{_datadir}/pki/ra
 %{_datadir}/pki/ra/conf/
 %{_datadir}/pki/ra/docroot/
@@ -232,17 +181,22 @@ 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
+* Fri Dec 7 2012 Ade Lee <alee at redhat.com> 10.0.0-1
+- Update to official release for rc1
+
+* Tue Nov 20 2012 Ade Lee <alee at 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 at redhat.com> 10.0.0-0.11.b3
 - Update release to b3
 
diff --git a/sources b/sources
index 810df78..a6796da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c5d43a94847d30304e6b0ee38bfe897  pki-ra-10.0.0.b3.tar.gz
+26c6704d804211d2a07191df5e654da4  pki-ra-10.0.0.tar.gz