summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2011-01-21 22:30:03 +0000
committermharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2011-01-21 22:30:03 +0000
commitb4bddee336b18a7df16301d72c461daed92ee771 (patch)
tree058b7cd8a947dacff0e560effe9cc8a5642182ab
parent5badec2480c5b160945d01371fb74cc8d01216cc (diff)
Bugzilla Bug #671265 - pki-symkey jar version incorrect
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1763 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
-rw-r--r--pki/base/symkey/CMakeLists.txt2
-rw-r--r--pki/base/symkey/src/CMakeLists.txt2
-rw-r--r--pki/specs/pki-core.spec9
3 files changed, 9 insertions, 4 deletions
diff --git a/pki/base/symkey/CMakeLists.txt b/pki/base/symkey/CMakeLists.txt
index 717c9cf5f..e994c0721 100644
--- a/pki/base/symkey/CMakeLists.txt
+++ b/pki/base/symkey/CMakeLists.txt
@@ -1,6 +1,4 @@
project(symkey)
-set(SYMKEY_LIBRARY_VERSION 9.0.0)
-
add_subdirectory(src)
add_subdirectory(src/com/netscape/symkey)
diff --git a/pki/base/symkey/src/CMakeLists.txt b/pki/base/symkey/src/CMakeLists.txt
index 723e59bb3..be5dc2fa4 100644
--- a/pki/base/symkey/src/CMakeLists.txt
+++ b/pki/base/symkey/src/CMakeLists.txt
@@ -14,7 +14,7 @@ set(symkey_java_SRCS
set(CMAKE_JNI_TARGET TRUE)
set(CMAKE_JAVA_INCLUDE_PATH ${JSS_JAR})
-set(CMAKE_JAVA_TARGET_VERSION ${SYMKEY_LIBRARY_VERSION})
+set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
add_jar(symkey ${symkey_java_SRCS})
install_jar(symkey ${LIB_INSTALL_DIR}/symkey)
diff --git a/pki/specs/pki-core.spec b/pki/specs/pki-core.spec
index 7403b063c..310923505 100644
--- a/pki/specs/pki-core.spec
+++ b/pki/specs/pki-core.spec
@@ -1,6 +1,6 @@
Name: pki-core
Version: 9.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Certificate System - PKI Core Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -550,6 +550,13 @@ fi
%changelog
+* Thu Jan 20 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.1-2
+- 'pki-symkey'
+- Bugzilla Bug #671265 - pki-symkey jar version incorrect
+- 'pki-common'
+- Bugzilla Bug #564207 - Searches for completed requests in the agent
+ interface returns zero entries
+
* Tue Jan 18 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.1-1
- Allow 'pki-native-tools' to be installed independently of 'pki-setup'
- Removed explicit 'pki-setup' requirement from 'pki-ca'