[pki-core] Release Candidate 1

[Ade Lee]

commit 61e82b0a10faf9f95df1fd37d27450f483eca5aa
Author: Ade Lee <alee at redhat.com>
Date:   Fri Dec 7 17:48:44 2012 -0500

    Release Candidate 1

 .gitignore    |    1 +
 pki-core.spec |   58 ++++++++++++++++++++++++++------------------------------
 sources       |    2 +-
 3 files changed, 29 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 43a6a3d..2136e94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /pki-core-10.0.0.b1.tar.gz
 /pki-core-10.0.0.b2.tar.gz
 /pki-core-10.0.0.b3.tar.gz
+/pki-core-10.0.0.tar.gz
diff --git a/pki-core.spec b/pki-core.spec
index e923452..d78ee94 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -1,12 +1,3 @@
-# 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
-# we are assuming f17+ and rhel 7+
-
-%global prerel .b3
-# also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
-%global relprefix 0.
-
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
 distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from
@@ -14,7 +5,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name:             pki-core
 Version:          10.0.0
-Release:          %{?relprefix}53%{?prerel}%{?dist}
+Release:          1%{?dist}
 Summary:          Certificate System - PKI Core Components
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -462,7 +453,6 @@ This package is a part of the PKI Core used by the Certificate System.
 %clean
 %{__rm} -rf %{buildroot}
 
-
 %build
 %{__mkdir_p} build
 cd build
@@ -471,6 +461,11 @@ cd build
 	-DBUILD_PKI_CORE:BOOL=ON \
 	-DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
 	-DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \
+%if 0%{?rhel}
+	-DRESTEASY_LIB=/usr/share/java/resteasy-base \
+%else
+	-DRESTEASY_LIB=/usr/share/java/resteasy \
+%endif
 	%{?_without_javadoc:-DWITH_JAVADOC:BOOL=OFF} \
 %if ! 0%{?rhel} && 0%{?fedora} <= 17
         -DBUILD_PKI_SELINUX:BOOL=ON \
@@ -804,11 +799,13 @@ fi
 %{_bindir}/TokenInfo
 %{_javadir}/pki/pki-tools.jar
 %{_datadir}/pki/java-tools/
+%{_mandir}/man1/*
 
 
 %files -n pki-server
 %defattr(-,root,root,-)
 %doc base/deploy/LICENSE
+%{_sysconfdir}/pki/
 %{_sbindir}/pkispawn
 %{_sbindir}/pkidestroy
 #%{_bindir}/pki-setup-proxy
@@ -817,22 +814,11 @@ fi
 %{python_sitelib}/pki/deployment/
 %dir %{_datadir}/pki/deployment
 %{_datadir}/pki/deployment/config/
-%dir %{_datadir}/pki/deployment/spawn
-%{_datadir}/pki/deployment/spawn/ca/
-%{_datadir}/pki/deployment/spawn/kra/
-%{_datadir}/pki/deployment/spawn/ocsp/
-%{_datadir}/pki/deployment/spawn/ra/
-%{_datadir}/pki/deployment/spawn/tks/
-%{_datadir}/pki/deployment/spawn/tps/
-%dir %{_datadir}/pki/deployment/destroy
-%{_datadir}/pki/deployment/destroy/ca/
-%{_datadir}/pki/deployment/destroy/kra/
-%{_datadir}/pki/deployment/destroy/ocsp/
-%{_datadir}/pki/deployment/destroy/ra/
-%{_datadir}/pki/deployment/destroy/tks/
-%{_datadir}/pki/deployment/destroy/tps/
 %dir %{_datadir}/pki/scripts
 %{_datadir}/pki/scripts/operations
+%{_datadir}/pki/scripts/pkicommon.pm
+%{_datadir}/pki/scripts/functions
+%{_datadir}/pki/scripts/pki_apache_initscript
 %dir %{_localstatedir}/lock/pki
 %dir %{_localstatedir}/run/pki
 %{_bindir}/pkidaemon
@@ -850,14 +836,10 @@ fi
 %{_bindir}/pkiremove
 %{_bindir}/pki-setup-proxy
 %{_bindir}/pkisilent
-%dir %{_datadir}/pki/scripts
-%{_datadir}/pki/scripts/pkicommon.pm
-%{_datadir}/pki/scripts/functions
-%{_datadir}/pki/scripts/pki_apache_initscript
 %{_datadir}/pki/silent/
-%dir %{_localstatedir}/lock/pki
-%dir %{_localstatedir}/run/pki
 %{_bindir}/pkicontrol
+%{_mandir}/man5/*
+%{_mandir}/man8/*
 
 # Details:
 #
@@ -972,6 +954,20 @@ fi
 
 
 %changelog
+* Fri Dec 7 2012 Ade Lee <alee at redhat.com> 10.0.0-1
+- Update to official release for rc1
+
+* Thu Dec  6 2012 Matthew Harmsen <mharmsen at redhat.com> 10.0.0-0.56.b3
+- TRAC Ticket #315 - Man pages for pkispawn/pkidestroy.
+- Added place-holders for 'pki.1' and 'pki_default.cfg.5' man pages.
+
+* Thu Dec 6 2012 Endi S. Dewata <edewata at redhat.com> 10.0.0-0.55.b3
+- Added system-wide configuration /etc/pki/pki.conf.
+- Removed redundant lines in %files.
+
+* Tue Dec 4 2012 Endi S. Dewata <edewata at redhat.com> 10.0.0-0.54.b3
+- Moved default deployment configuration to /etc/pki.
+
 * Mon Nov 19 2012 Ade Lee <alee at redhat.com> 10.0.0-0.53.b3
 - Cleaned up spec file to provide only support rhel 7+, f17+
 - Added resteasy-base dependency for rhel 7
diff --git a/sources b/sources
index bfda001..eab5e64 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e4991b0df4dd6ba775ea6e140d095d21  pki-core-10.0.0.b3.tar.gz
+82d0a6d91a16308f7c20a2560daf8fab  pki-core-10.0.0.tar.gz