[pki-kra/f15] Bugzilla Bug #796006 - Get DOGTAG_9_BRANCH GIT repository in-sync

[kwright]

commit 736f5aa3b1458a101f4a4824a04ff4f76b074a1a
Author: Kevin Wright <kwright at redhat.com>
Date:   Mon Mar 12 18:41:19 2012 -0700

    Bugzilla Bug #796006 - Get DOGTAG_9_BRANCH GIT repository in-sync
    
      with DOGTAG_9_BRANCH SVN repository . . .
    - Bugzilla Bug #787806 - RSA should be default selection for transport
      key till "ECC phase 4" is implemented

 .gitignore   |    1 +
 clog         |   11 +++++------
 pki-kra.spec |   22 ++++++++++++++++------
 sources      |    2 +-
 4 files changed, 23 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 65b5516..2ab0a66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ pki-kra-1.3.4.tar.gz
 /pki-kra-9.0.5.tar.gz
 /pki-kra-9.0.8.tar.gz
 /pki-kra-9.0.9.tar.gz
+/pki-kra-9.0.10.tar.gz
diff --git a/clog b/clog
index 53e8d49..bae9f35 100644
--- a/clog
+++ b/clog
@@ -1,6 +1,5 @@
-Bugzilla Bug #737122 - DRM: during archiving and recovering,
-wrapping unwrapping keys should be done in the token (cfu)
-Bugzilla Bug #744797 - KRA key recovery (retrieve pkcs#12) fails after
-the in-place upgrade( CS 8.0->8.1) (cfu)
-Bugzilla Bug #749945 - Installation error reported during CA, DRM,
-OCSP, and TKS package installation . . . (mharmsen)
+Bugzilla Bug #796006 - Get DOGTAG_9_BRANCH GIT repository in-sync
+
+  with DOGTAG_9_BRANCH SVN repository . . .
+- Bugzilla Bug #787806 - RSA should be default selection for transport
+  key till "ECC phase 4" is implemented
diff --git a/pki-kra.spec b/pki-kra.spec
index 0747773..bd14308 100644
--- a/pki-kra.spec
+++ b/pki-kra.spec
@@ -1,5 +1,5 @@
 Name:             pki-kra
-Version:          9.0.9
+Version:          9.0.10
 Release:          1%{?dist}
 Summary:          Certificate System - Data Recovery Manager
 URL:              http://pki.fedoraproject.org/
@@ -22,8 +22,8 @@ BuildRequires:    nss-devel
 %if 0%{?fedora} >= 16
 BuildRequires:    jpackage-utils >= 0:1.7.5-10
 BuildRequires:    jss >= 4.2.6-19.1
-BuildRequires:    pki-common >= 9.0.15
-BuildRequires:    pki-util >= 9.0.15
+BuildRequires:    pki-common >= 9.0.18
+BuildRequires:    pki-util >= 9.0.18
 BuildRequires:    systemd-units
 %else
 BuildRequires:    jpackage-utils
@@ -35,8 +35,8 @@ BuildRequires:    pki-util
 Requires:         java >= 1:1.6.0
 Requires:         pki-kra-theme >= 9.0.0
 %if 0%{?fedora} >= 16
-Requires:         pki-common >= 9.0.15
-Requires:         pki-selinux >= 9.0.15
+Requires:         pki-common >= 9.0.18
+Requires:         pki-selinux >= 9.0.18
 Requires(post):   systemd-units
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
@@ -122,7 +122,7 @@ Additionally, Certificate System requires ONE AND ONLY ONE of the following
 %build
 %{__mkdir_p} build
 cd build
-%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_KRA:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} ..
+%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_KRA:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} -DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} ..
 %{__make} VERBOSE=1 %{?_smp_mflags}
 
 
@@ -238,6 +238,16 @@ fi
 
 
 %changelog
+* Fri Mar  9 2012 Matthew Harmsen <mharmsen at redhat.com> 9.0.10-1
+- Bugzilla Bug #796006 - Get DOGTAG_9_BRANCH GIT repository in-sync
+  with DOGTAG_9_BRANCH SVN repository . . .
+- Bugzilla Bug #787806 - RSA should be default selection for transport
+  key till "ECC phase 4" is implemented
+
+* Wed Feb 22 2012 Matthew Harmsen <mharmsen at redhat.com> 9.0.9-2
+- Add '-DSYSTEMD_LIB_INSTALL_DIR' override flag to 'cmake' to address changes
+  in fundamental path structure in Fedora 17
+
 * Fri Oct 28 2011 Matthew Harmsen <mharmsen at redhat.com> 9.0.9-1
 - Bugzilla Bug #737122 - DRM: during archiving and recovering,
   wrapping unwrapping keys should be done in the token (cfu)
diff --git a/sources b/sources
index 99704e0..b6553f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-50f829899ff9a73642370416176e3e2e  pki-kra-9.0.9.tar.gz
+0368c9071d7440d68c5350af5e8ef506  pki-kra-9.0.10.tar.gz