From 9eccf374c78ce34fd488792b3a1a82a2032bb162 Mon Sep 17 00:00:00 2001 From: mharmsen Date: Tue, 13 Sep 2011 02:50:45 +0000 Subject: Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2197 c9f7a03b-bd48-0410-a16d-cbbf54688b0b --- pki/CMakeLists.txt | 12 +++--- pki/base/ca/src/CMakeLists.txt | 6 +-- pki/base/common/src/CMakeLists.txt | 14 +++---- pki/base/console/src/CMakeLists.txt | 20 +++++----- pki/base/console/templates/pki_console_wrapper | 5 +++ pki/base/java-tools/src/CMakeLists.txt | 8 ++-- .../templates/pki_java_command_wrapper.in | 10 +++++ .../templates/pretty_print_cert_command_wrapper.in | 10 +++++ .../templates/pretty_print_crl_command_wrapper.in | 10 +++++ pki/base/kra/src/CMakeLists.txt | 10 ++--- pki/base/ocsp/src/CMakeLists.txt | 10 ++--- pki/base/setup/pkicommon.pm | 8 ++-- pki/base/silent/src/CMakeLists.txt | 6 +-- pki/base/symkey/src/CMakeLists.txt | 2 +- .../symkey/src/com/netscape/symkey/CMakeLists.txt | 2 +- pki/base/tks/src/CMakeLists.txt | 10 ++--- pki/base/util/src/CMakeLists.txt | 10 ++--- pki/scripts/compose_dogtag_pki_theme_packages | 2 +- pki/scripts/compose_pki_console_packages | 2 +- pki/scripts/compose_pki_core_packages | 2 +- pki/scripts/compose_pki_kra_packages | 2 +- pki/scripts/compose_pki_ocsp_packages | 2 +- pki/scripts/compose_pki_tks_packages | 2 +- pki/specs/dogtag-pki-theme.spec | 19 ++++++++- pki/specs/pki-console.spec | 16 +++++++- pki/specs/pki-core.spec | 46 +++++++++++++++++++++- pki/specs/pki-kra.spec | 11 +++++- pki/specs/pki-ocsp.spec | 11 +++++- pki/specs/pki-tks.spec | 11 +++++- 29 files changed, 203 insertions(+), 76 deletions(-) diff --git a/pki/CMakeLists.txt b/pki/CMakeLists.txt index 6a25b402..c753d841 100644 --- a/pki/CMakeLists.txt +++ b/pki/CMakeLists.txt @@ -17,26 +17,26 @@ if (BUILD_IPA_PKI_THEME) elseif (BUILD_DOGTAG_PKI_THEME) set(APPLICATION_FLAVOR_DOGTAG_PKI_THEME TRUE) # override APPLICATION VERSION - set(APPLICATION_VERSION_PATCH "7") + set(APPLICATION_VERSION_PATCH "8") elseif (BUILD_REDHAT_PKI_THEME) set(APPLICATION_FLAVOR_REDHAT_PKI_THEME TRUE) elseif (BUILD_PKI_CORE) set(APPLICATION_FLAVOR_PKI_CORE TRUE) # override APPLICATION VERSION - set(APPLICATION_VERSION_PATCH "13") + set(APPLICATION_VERSION_PATCH "14") elseif (BUILD_PKI_KRA) set(APPLICATION_FLAVOR_PKI_KRA TRUE) # override APPLICATION VERSION - set(APPLICATION_VERSION_PATCH "6") + set(APPLICATION_VERSION_PATCH "7") elseif (BUILD_PKI_OCSP) set(APPLICATION_FLAVOR_PKI_OCSP TRUE) - set(APPLICATION_VERSION_PATCH "5") + set(APPLICATION_VERSION_PATCH "6") elseif (BUILD_PKI_RA) set(APPLICATION_FLAVOR_PKI_RA TRUE) set(APPLICATION_VERSION_PATCH "3") elseif (BUILD_PKI_TKS) set(APPLICATION_FLAVOR_PKI_TKS TRUE) - set(APPLICATION_VERSION_PATCH "5") + set(APPLICATION_VERSION_PATCH "6") elseif (BUILD_PKI_TPS) set(APPLICATION_FLAVOR_PKI_TPS TRUE) # override APPLICATION VERSION @@ -44,7 +44,7 @@ elseif (BUILD_PKI_TPS) elseif (BUILD_PKI_CONSOLE) set(APPLICATION_FLAVOR_PKI_CONSOLE TRUE) # override APPLICATION VERSION - set(APPLICATION_VERSION_PATCH "3") + set(APPLICATION_VERSION_PATCH "4") elseif (BUILD_PKI_MIGRATE) set(APPLICATION_FLAVOR_PKI_MIGRATE TRUE) # override APPLICATION VERSION diff --git a/pki/base/ca/src/CMakeLists.txt b/pki/base/ca/src/CMakeLists.txt index 54dde47a..2adda546 100644 --- a/pki/base/ca/src/CMakeLists.txt +++ b/pki/base/ca/src/CMakeLists.txt @@ -9,19 +9,19 @@ find_file(LDAPJDK_JAR ) -# '/usr/lib/java' jars +# '${JAVA_LIB_INSTALL_DIR}' jars find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) find_file(OSUTIL_JAR NAMES osutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) diff --git a/pki/base/common/src/CMakeLists.txt b/pki/base/common/src/CMakeLists.txt index 2df82b8b..12e401d8 100644 --- a/pki/base/common/src/CMakeLists.txt +++ b/pki/base/common/src/CMakeLists.txt @@ -4,7 +4,7 @@ find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -12,7 +12,7 @@ find_file(LDAPJDK_JAR NAMES ldapjdk.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -20,7 +20,7 @@ find_file(OSUTIL_JAR NAMES osutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -28,7 +28,7 @@ find_file(SERVLET_JAR NAMES servlet.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -36,7 +36,7 @@ find_file(VELOCITY_JAR NAMES velocity.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -44,7 +44,7 @@ find_file(XALAN_JAR NAMES xalan-j2.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -52,7 +52,7 @@ find_file(XERCES_JAR NAMES xerces-j2.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) diff --git a/pki/base/console/src/CMakeLists.txt b/pki/base/console/src/CMakeLists.txt index dd6b9261..b8a89775 100644 --- a/pki/base/console/src/CMakeLists.txt +++ b/pki/base/console/src/CMakeLists.txt @@ -5,7 +5,7 @@ find_file(PKI_NSUTIL_JAR NAMES pki-nsutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java/pki ) @@ -15,7 +15,7 @@ find_file(BASE_JAR NAMES idm-console-base.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -23,7 +23,7 @@ find_file(LDAPJDK_JAR NAMES ldapjdk.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -31,7 +31,7 @@ find_file(MMC_JAR NAMES idm-console-mcc.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -39,7 +39,7 @@ find_file(MMC_EN_JAR NAMES idm-console-mcc_en.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -47,7 +47,7 @@ find_file(NMCLF_JAR NAMES idm-console-nmclf.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -55,17 +55,17 @@ find_file(NMCLF_EN_JAR NAMES idm-console-nmclf_en.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) -# '/usr/lib/java' jars +# '${JAVA_LIB_INSTALL_DIR}' jars find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -73,7 +73,7 @@ find_file(OSUTIL_JAR NAMES osutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) diff --git a/pki/base/console/templates/pki_console_wrapper b/pki/base/console/templates/pki_console_wrapper index feaf87d7..eec4725b 100755 --- a/pki/base/console/templates/pki_console_wrapper +++ b/pki/base/console/templates/pki_console_wrapper @@ -140,6 +140,11 @@ fi CP=/usr/lib/java/jss4.jar CP=/usr/lib/java/dirsec/jss4.jar:${CP} +if [ "${OS}" = "Linux" ] && + [ "${ARCHITECTURE}" = "x86_64" ] ; then + # Fedora 16+ + CP=/usr/lib64/java/jss4.jar +fi CP=/usr/share/java/ldapjdk.jar:${CP} CP=/usr/share/java/idm-console-nmclf.jar:${CP} CP=/usr/share/java/idm-console-nmclf_en.jar:${CP} diff --git a/pki/base/java-tools/src/CMakeLists.txt b/pki/base/java-tools/src/CMakeLists.txt index 678671e7..90fe31ae 100644 --- a/pki/base/java-tools/src/CMakeLists.txt +++ b/pki/base/java-tools/src/CMakeLists.txt @@ -4,7 +4,7 @@ find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -12,7 +12,7 @@ find_file(OSUTIL_JAR NAMES osutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -20,7 +20,7 @@ find_file(XALAN_JAR NAMES xalan-j2.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -28,7 +28,7 @@ find_file(XERCES_JAR NAMES xerces-j2.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) diff --git a/pki/base/java-tools/templates/pki_java_command_wrapper.in b/pki/base/java-tools/templates/pki_java_command_wrapper.in index 3c804de3..4136eeeb 100644 --- a/pki/base/java-tools/templates/pki_java_command_wrapper.in +++ b/pki/base/java-tools/templates/pki_java_command_wrapper.in @@ -130,8 +130,18 @@ fi CP=/usr/lib/java/jss4.jar CP=/usr/lib/java/dirsec/jss4.jar:${CP} +if [ "${OS}" = "Linux" ] && + [ "${ARCHITECTURE}" = "x86_64" ] ; then + # Fedora 16+ + CP=/usr/lib64/java/jss4.jar +fi CP=/usr/lib/java/osutil.jar:${CP} CP=/usr/lib/java/dirsec/osutil.jar:${CP} +if [ "${OS}" = "Linux" ] && + [ "${ARCHITECTURE}" = "x86_64" ] ; then + # Fedora 16+ + CP=/usr/lib64/java/osutil.jar:${CP} +fi CP=/usr/share/java/ldapjdk.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-cmsutil.jar:${CP} diff --git a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in index ce54ed02..fe0262c8 100644 --- a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in +++ b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in @@ -130,8 +130,18 @@ fi CP=/usr/lib/java/jss4.jar CP=/usr/lib/java/dirsec/jss4.jar:${CP} +if [ "${OS}" = "Linux" ] && + [ "${ARCHITECTURE}" = "x86_64" ] ; then + # Fedora 16+ + CP=/usr/lib64/java/jss4.jar +fi CP=/usr/lib/java/osutil.jar:${CP} CP=/usr/lib/java/dirsec/osutil.jar:${CP} +if [ "${OS}" = "Linux" ] && + [ "${ARCHITECTURE}" = "x86_64" ] ; then + # Fedora 16+ + CP=/usr/lib64/java/osutil.jar:${CP} +fi CP=/usr/share/java/ldapjdk.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-cmsutil.jar:${CP} diff --git a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in index 38f46856..333983a4 100644 --- a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in +++ b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in @@ -130,8 +130,18 @@ fi CP=/usr/lib/java/jss4.jar CP=/usr/lib/java/dirsec/jss4.jar:${CP} +if [ "${OS}" = "Linux" ] && + [ "${ARCHITECTURE}" = "x86_64" ] ; then + # Fedora 16+ + CP=/usr/lib64/java/jss4.jar +fi CP=/usr/lib/java/osutil.jar:${CP} CP=/usr/lib/java/dirsec/osutil.jar:${CP} +if [ "${OS}" = "Linux" ] && + [ "${ARCHITECTURE}" = "x86_64" ] ; then + # Fedora 16+ + CP=/usr/lib64/java/osutil.jar:${CP} +fi CP=/usr/share/java/ldapjdk.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-cmsutil.jar:${CP} diff --git a/pki/base/kra/src/CMakeLists.txt b/pki/base/kra/src/CMakeLists.txt index 9879fbae..a023c00b 100644 --- a/pki/base/kra/src/CMakeLists.txt +++ b/pki/base/kra/src/CMakeLists.txt @@ -33,7 +33,7 @@ find_file(PKI_NSUTIL_JAR NAMES pki-nsutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java/pki ) @@ -47,26 +47,26 @@ find_file(LDAPJDK_JAR ) -# '/usr/lib/java' jars +# '${JAVA_LIB_INSTALL_DIR}' jars find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) find_file(OSUTIL_JAR NAMES osutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) find_file(SYMKEY_JAR NAMES symkey.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) diff --git a/pki/base/ocsp/src/CMakeLists.txt b/pki/base/ocsp/src/CMakeLists.txt index 5e14d079..f7cb0140 100644 --- a/pki/base/ocsp/src/CMakeLists.txt +++ b/pki/base/ocsp/src/CMakeLists.txt @@ -33,7 +33,7 @@ find_file(PKI_NSUTIL_JAR NAMES pki-nsutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java/pki ) @@ -47,26 +47,26 @@ find_file(LDAPJDK_JAR ) -# '/usr/lib/java' jars +# '${JAVA_LIB_INSTALL_DIR}' jars find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) find_file(OSUTIL_JAR NAMES osutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) find_file(SYMKEY_JAR NAMES symkey.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) diff --git a/pki/base/setup/pkicommon.pm b/pki/base/setup/pkicommon.pm index 51db599f..218c2886 100755 --- a/pki/base/setup/pkicommon.pm +++ b/pki/base/setup/pkicommon.pm @@ -31,7 +31,7 @@ our @EXPORT = qw( $verbose $dry_run $hostname $default_hardware_platform $default_system_binaries $default_lockdir $default_system_libraries $default_system_user_binaries $default_system_user_libraries - $default_java_path $default_pki_java_path $default_system_jni_java_path @default_jar_path + $default_java_path $default_pki_java_path $default_x86_64_jni_java_path $default_system_jni_java_path @default_jar_path $default_security_libraries $default_certutil_command $default_ldapmodify_command $default_modutil_command $default_dir_permissions $default_exe_permissions $default_file_permissions @@ -170,6 +170,7 @@ our $default_system_user_binaries = undef; our $default_system_user_libraries = undef; our $default_java_path = undef; our $default_pki_java_path = undef; +our $default_x86_64_jni_java_path = undef; our $default_system_jni_java_path = undef; our @default_jar_path = undef; our $default_security_libraries = undef; @@ -207,6 +208,7 @@ if ($^O eq "linux") { $default_java_path = "/usr/share/java"; $default_pki_java_path = "/usr/share/java/pki"; $default_system_jni_java_path = "/usr/lib/java"; + @default_jar_path = ($default_pki_java_path, $default_java_path, $default_system_jni_java_path); } elsif ($default_hardware_platform eq "x86_64") { # 64-bit Linux $default_system_binaries = "/bin"; @@ -215,14 +217,14 @@ if ($^O eq "linux") { $default_system_user_libraries = "/usr/lib64"; $default_java_path = "/usr/share/java"; $default_pki_java_path = "/usr/share/java/pki"; + $default_x86_64_jni_java_path = "/usr/lib64/java"; $default_system_jni_java_path = "/usr/lib/java"; + @default_jar_path = ($default_pki_java_path, $default_java_path, $default_x86_64_jni_java_path, $default_system_jni_java_path); } else { emit("Unsupported '$^O' hardware platform '$default_hardware_platform'!", "error"); exit 255; } - @default_jar_path = ($default_pki_java_path, $default_java_path, $default_system_jni_java_path); - # Retrieve hostname if (defined($ENV{'PKI_HOSTNAME'})) { # IPv6: Retrieve hostname from environment variable diff --git a/pki/base/silent/src/CMakeLists.txt b/pki/base/silent/src/CMakeLists.txt index d7bfc6b1..4a3ab4a7 100644 --- a/pki/base/silent/src/CMakeLists.txt +++ b/pki/base/silent/src/CMakeLists.txt @@ -4,7 +4,7 @@ find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -12,7 +12,7 @@ find_file(LDAPJDK_JAR NAMES ldapjdk.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -20,7 +20,7 @@ find_file(XERCES_JAR NAMES xerces-j2.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) diff --git a/pki/base/symkey/src/CMakeLists.txt b/pki/base/symkey/src/CMakeLists.txt index be5dc2fa..599a7cb5 100644 --- a/pki/base/symkey/src/CMakeLists.txt +++ b/pki/base/symkey/src/CMakeLists.txt @@ -4,7 +4,7 @@ find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) diff --git a/pki/base/symkey/src/com/netscape/symkey/CMakeLists.txt b/pki/base/symkey/src/com/netscape/symkey/CMakeLists.txt index 75b848d4..47d40a3f 100644 --- a/pki/base/symkey/src/com/netscape/symkey/CMakeLists.txt +++ b/pki/base/symkey/src/com/netscape/symkey/CMakeLists.txt @@ -41,7 +41,7 @@ add_custom_command( ${symkey_library_HDRS} COMMAND ${JAVA_HEADER} - -classpath ${SYMKEY_JAVA_OBJECT_DIR}:/usr/lib/java/jss4.jar + -classpath ${SYMKEY_JAVA_OBJECT_DIR}:${JAVA_LIB_INSTALL_DIR}/jss4.jar -jni -d ${CMAKE_CURRENT_BINARY_DIR} com.netscape.symkey.SessionKey ) diff --git a/pki/base/tks/src/CMakeLists.txt b/pki/base/tks/src/CMakeLists.txt index 5ec7101b..caeda018 100644 --- a/pki/base/tks/src/CMakeLists.txt +++ b/pki/base/tks/src/CMakeLists.txt @@ -33,7 +33,7 @@ find_file(PKI_NSUTIL_JAR NAMES pki-nsutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java/pki ) @@ -47,26 +47,26 @@ find_file(LDAPJDK_JAR ) -# '/usr/lib/java' jars +# '${JAVA_LIB_INSTALL_DIR}' jars find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) find_file(OSUTIL_JAR NAMES osutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) find_file(SYMKEY_JAR NAMES symkey.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) diff --git a/pki/base/util/src/CMakeLists.txt b/pki/base/util/src/CMakeLists.txt index a7f0f4e6..8894cf22 100644 --- a/pki/base/util/src/CMakeLists.txt +++ b/pki/base/util/src/CMakeLists.txt @@ -4,7 +4,7 @@ find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -12,7 +12,7 @@ find_file(LDAPJDK_JAR NAMES ldapjdk.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -20,7 +20,7 @@ find_file(OSUTIL_JAR NAMES osutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -28,7 +28,7 @@ find_file(XALAN_JAR NAMES xalan-j2.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -36,7 +36,7 @@ find_file(XERCES_JAR NAMES xerces-j2.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) diff --git a/pki/scripts/compose_dogtag_pki_theme_packages b/pki/scripts/compose_dogtag_pki_theme_packages index 50c4b34d..2de40562 100755 --- a/pki/scripts/compose_dogtag_pki_theme_packages +++ b/pki/scripts/compose_dogtag_pki_theme_packages @@ -31,7 +31,7 @@ PKI_PWD=`pwd` ## DOGTAG_PKI_THEME="dogtag-pki-theme" -DOGTAG_PKI_THEME_VERSION="9.0.7" +DOGTAG_PKI_THEME_VERSION="9.0.8" ## diff --git a/pki/scripts/compose_pki_console_packages b/pki/scripts/compose_pki_console_packages index 2d656025..e4b4868d 100755 --- a/pki/scripts/compose_pki_console_packages +++ b/pki/scripts/compose_pki_console_packages @@ -31,7 +31,7 @@ PKI_PWD=`pwd` ## PKI_CONSOLE="pki-console" -PKI_CONSOLE_VERSION="9.0.3" +PKI_CONSOLE_VERSION="9.0.4" ## diff --git a/pki/scripts/compose_pki_core_packages b/pki/scripts/compose_pki_core_packages index 86a2380d..24ef03c5 100755 --- a/pki/scripts/compose_pki_core_packages +++ b/pki/scripts/compose_pki_core_packages @@ -31,7 +31,7 @@ PKI_PWD=`pwd` ## PKI_CORE="pki-core" -PKI_CORE_VERSION="9.0.13" +PKI_CORE_VERSION="9.0.14" ## diff --git a/pki/scripts/compose_pki_kra_packages b/pki/scripts/compose_pki_kra_packages index 06623f05..10af8f8e 100755 --- a/pki/scripts/compose_pki_kra_packages +++ b/pki/scripts/compose_pki_kra_packages @@ -31,7 +31,7 @@ PKI_PWD=`pwd` ## PKI_KRA="pki-kra" -PKI_KRA_VERSION="9.0.6" +PKI_KRA_VERSION="9.0.7" ## diff --git a/pki/scripts/compose_pki_ocsp_packages b/pki/scripts/compose_pki_ocsp_packages index ee62a3eb..21cdd1dc 100755 --- a/pki/scripts/compose_pki_ocsp_packages +++ b/pki/scripts/compose_pki_ocsp_packages @@ -31,7 +31,7 @@ PKI_PWD=`pwd` ## PKI_OCSP="pki-ocsp" -PKI_OCSP_VERSION="9.0.5" +PKI_OCSP_VERSION="9.0.6" ## diff --git a/pki/scripts/compose_pki_tks_packages b/pki/scripts/compose_pki_tks_packages index da02251f..44c59383 100755 --- a/pki/scripts/compose_pki_tks_packages +++ b/pki/scripts/compose_pki_tks_packages @@ -31,7 +31,7 @@ PKI_PWD=`pwd` ## PKI_TKS="pki-tks" -PKI_TKS_VERSION="9.0.5" +PKI_TKS_VERSION="9.0.6" ## diff --git a/pki/specs/dogtag-pki-theme.spec b/pki/specs/dogtag-pki-theme.spec index 5c7b6473..0d658062 100644 --- a/pki/specs/dogtag-pki-theme.spec +++ b/pki/specs/dogtag-pki-theme.spec @@ -1,5 +1,5 @@ Name: dogtag-pki-theme -Version: 9.0.7 +Version: 9.0.8 Release: 1%{?dist} Summary: Certificate System - Dogtag PKI Theme Components URL: http://pki.fedoraproject.org/ @@ -12,7 +12,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake BuildRequires: java-devel >= 1:1.6.0 +%if 0%{?fedora} >= 16 +BuildRequires: jpackage-utils >= 1.7.5-10 +%else BuildRequires: jpackage-utils +%endif Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz @@ -270,7 +274,7 @@ This package is used by the Dogtag Certificate System. %build %{__mkdir_p} build cd build -%cmake -DBUILD_DOGTAG_PKI_THEME:BOOL=ON .. +%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_DOGTAG_PKI_THEME:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} .. %{__make} VERBOSE=1 %{?_smp_mflags} @@ -346,6 +350,17 @@ chmod 755 %{buildroot}%{_datadir}/pki/tps-ui/cgi-bin/sow/cfg.pl %changelog +* Mon Sep 12 2011 Matthew Harmsen 9.0.8-1 +- 'dogtag-pki-ca-theme' +- 'dogtag-pki-common-theme' +- 'dogtag-pki-console-theme' +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . +- 'dogtag-pki-kra-theme' +- 'dogtag-pki-ocsp-theme' +- 'dogtag-pki-ra-theme' +- 'dogtag-pki-tks-theme' +- 'dogtag-pki-tps-theme' + * Tue Aug 23 2011 Ade Lee 9.0.7-1 - 'dogtag-pki-ca-theme' - Bugzilla Bug #712931 - CS requires too many ports diff --git a/pki/specs/pki-console.spec b/pki/specs/pki-console.spec index beb851dc..ef59bac6 100644 --- a/pki/specs/pki-console.spec +++ b/pki/specs/pki-console.spec @@ -1,5 +1,5 @@ Name: pki-console -Version: 9.0.3 +Version: 9.0.4 Release: 1%{?dist} Summary: Certificate System - PKI Console URL: http://pki.fedoraproject.org/ @@ -13,7 +13,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake BuildRequires: idm-console-framework BuildRequires: java-devel >= 1:1.6.0 +%if 0%{?fedora} >= 16 +BuildRequires: jpackage-utils >= 1.7.5-10 +%else BuildRequires: jpackage-utils +%endif BuildRequires: jss >= 4.2.6-17 BuildRequires: ldapjdk BuildRequires: nspr-devel @@ -22,6 +26,11 @@ BuildRequires: pki-util Requires: idm-console-framework Requires: java >= 1:1.6.0 +%if 0%{?fedora} >= 16 +Requires: jpackage-utils >= 1.7.5-10 +%else +Requires: jpackage-utils +%endif Requires: jss >= 4.2.6-17 Requires: ldapjdk Requires: pki-console-theme @@ -54,7 +63,7 @@ following "Mutually-Exclusive" PKI Theme packages: %build %{__mkdir_p} build cd build -%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_CONSOLE:BOOL=ON .. +%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_CONSOLE:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} .. %{__make} VERBOSE=1 %{?_smp_mflags} @@ -72,6 +81,9 @@ cd build %changelog +* Wed Aug 31 2011 Matthew Harmsen 9.0.4-1 +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . + * Thu Jul 14 2011 Matthew Harmsen 9.0.3-1 - Bugzilla Bug #700462 - No action on clicking "Help" button of pkiconsole's right pane (alee) diff --git a/pki/specs/pki-core.spec b/pki/specs/pki-core.spec index eaf0ee23..a0422bd1 100644 --- a/pki/specs/pki-core.spec +++ b/pki/specs/pki-core.spec @@ -1,5 +1,5 @@ Name: pki-core -Version: 9.0.13 +Version: 9.0.14 Release: 1%{?dist} Summary: Certificate System - PKI Core Components URL: http://pki.fedoraproject.org/ @@ -14,7 +14,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # pki-ca-theme requires versioning to meet runtime requirements BuildRequires: cmake BuildRequires: java-devel >= 1:1.6.0 +%if 0%{?fedora} >= 16 +BuildRequires: jpackage-utils >= 0:1.7.5-10 +%else BuildRequires: jpackage-utils +%endif BuildRequires: jss >= 4.2.6-17 BuildRequires: ldapjdk BuildRequires: nspr-devel @@ -123,7 +127,11 @@ Summary: Symmetric Key JNI Package Group: System Environment/Libraries Requires: java >= 1:1.6.0 +%if 0%{?fedora} >= 16 +Requires: jpackage-utils >= 0:1.7.5-10 +%else Requires: jpackage-utils +%endif Requires: jss >= 4.2.6-17 Requires: nss @@ -164,7 +172,11 @@ Group: System Environment/Base BuildArch: noarch Requires: java >= 1:1.6.0 +%if 0%{?fedora} >= 16 +Requires: jpackage-utils >= 0:1.7.5-10 +%else Requires: jpackage-utils +%endif Requires: jss >= 4.2.6-17 Requires: ldapjdk Requires: osutil @@ -206,6 +218,11 @@ Group: System Environment/Base BuildArch: noarch Requires: java >= 1:1.6.0 +%if 0%{?fedora} >= 16 +Requires: jpackage-utils >= 0:1.7.5-10 +%else +Requires: jpackage-utils +%endif Requires: pki-native-tools = %{version}-%{release} Requires: pki-util = %{version}-%{release} @@ -399,7 +416,7 @@ This package is a part of the PKI Core used by the Certificate System. %build %{__mkdir_p} build cd build -%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_CORE:BOOL=ON .. +%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_CORE:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} .. %{__make} VERBOSE=1 %{?_smp_mflags} @@ -410,11 +427,18 @@ cd build cd %{buildroot}%{_libdir}/symkey %{__rm} symkey.jar +%if 0%{?fedora} >= 16 +%{__rm} %{buildroot}%{_jnidir}/symkey.jar +%{__mv} symkey-%{version}.jar %{buildroot}%{_jnidir}/symkey.jar +%else %{__ln_s} symkey-%{version}.jar symkey.jar +%endif +%if 0%{?rhel} || 0%{?fedora} < 16 cd %{buildroot}%{_jnidir} %{__rm} symkey.jar %{__ln_s} %{_libdir}/symkey/symkey.jar symkey.jar +%endif %if 0%{?fedora} >= 15 # Details: @@ -642,6 +666,24 @@ fi %changelog +* Fri Sep 9 2011 Matthew Harmsen 9.0.14-1 +- 'pki-setup' +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . +- 'pki-symkey' +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . +- 'pki-native-tools' +- 'pki-util' +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . +- 'pki-java-tools' +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . +- 'pki-common' +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . +- 'pki-selinux' +- 'pki-ca' +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . +- 'pki-silent' +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . + * Tue Sep 6 2011 Ade Lee 9.0.13-1 - 'pki-setup' - Bugzilla Bug #699809 - Convert CS to use systemd (alee) diff --git a/pki/specs/pki-kra.spec b/pki/specs/pki-kra.spec index ef8c2c43..59402b49 100644 --- a/pki/specs/pki-kra.spec +++ b/pki/specs/pki-kra.spec @@ -1,5 +1,5 @@ Name: pki-kra -Version: 9.0.6 +Version: 9.0.7 Release: 1%{?dist} Summary: Certificate System - Data Recovery Manager URL: http://pki.fedoraproject.org/ @@ -12,7 +12,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake BuildRequires: java-devel >= 1:1.6.0 +%if 0%{?fedora} >= 16 +BuildRequires: jpackage-utils >= 0:1.7.5-10 +%else BuildRequires: jpackage-utils +%endif BuildRequires: jss >= 4.2.6-17 BuildRequires: nspr-devel BuildRequires: nss-devel @@ -104,7 +108,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 .. +%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_KRA:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} .. %{__make} VERBOSE=1 %{?_smp_mflags} @@ -197,6 +201,9 @@ fi %changelog +* Mon Sep 12 2011 Matthew Harmsen 9.0.7-1 +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . + * Tue Sep 6 2011 Ade Lee 9.0.6-1 - Bugzilla Bug #699809 - Convert CS to use systemd (alee) diff --git a/pki/specs/pki-ocsp.spec b/pki/specs/pki-ocsp.spec index 3467d042..a056c689 100644 --- a/pki/specs/pki-ocsp.spec +++ b/pki/specs/pki-ocsp.spec @@ -1,5 +1,5 @@ Name: pki-ocsp -Version: 9.0.5 +Version: 9.0.6 Release: 1%{?dist} Summary: Certificate System - Online Certificate Status Protocol Manager URL: http://pki.fedoraproject.org/ @@ -12,7 +12,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake BuildRequires: java-devel >= 1:1.6.0 +%if 0%{?fedora} >= 16 +BuildRequires: jpackage-utils >= 0:1.7.5-10 +%else BuildRequires: jpackage-utils +%endif BuildRequires: jss >= 4.2.6-17 BuildRequires: nspr-devel BuildRequires: nss-devel @@ -112,7 +116,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_OCSP:BOOL=ON .. +%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_OCSP:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} .. %{__make} VERBOSE=1 %{?_smp_mflags} @@ -208,6 +212,9 @@ fi %changelog +* Mon Sep 12 2011 Matthew Harmsen 9.0.6-1 +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . + * Tue Sep 6 2011 Ade Lee 9.0.5-1 - Bugzilla Bug #699809 - Convert CS to use systemd (alee) diff --git a/pki/specs/pki-tks.spec b/pki/specs/pki-tks.spec index 3001b5c5..8aee0d62 100644 --- a/pki/specs/pki-tks.spec +++ b/pki/specs/pki-tks.spec @@ -1,5 +1,5 @@ Name: pki-tks -Version: 9.0.5 +Version: 9.0.6 Release: 1%{?dist} Summary: Certificate System - Token Key Service URL: http://pki.fedoraproject.org/ @@ -12,7 +12,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake BuildRequires: java-devel >= 1:1.6.0 +%if 0%{?fedora} >= 16 +BuildRequires: jpackage-utils >= 0:1.7.5-10 +%else BuildRequires: jpackage-utils +%endif BuildRequires: jss >= 4.2.6-17 BuildRequires: nspr-devel BuildRequires: nss-devel @@ -105,7 +109,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_TKS:BOOL=ON .. +%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_TKS:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} .. %{__make} VERBOSE=1 %{?_smp_mflags} @@ -197,6 +201,9 @@ fi %changelog +* Mon Sep 12 2011 Matthew Harmsen 9.0.6-1 +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . + * Tue Sep 6 2011 Ade Lee 9.0.5-1 - Bugzilla Bug #699809 - Convert CS to use systemd -- cgit