Bugzilla Bug #568787 - pki-ca fails to create SSL connectors

Bugzilla Bug #573038 - Unable to login on Dogtag EPEL installation


git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1030 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

3 files changed, 27 insertions, 3 deletions

diff --git a/pki/dogtag/common/pki-common.spec b/pki/dogtag/common/pki-common.spec
index 24ff6f966..88aac7383 100644
--- a/pki/dogtag/common/pki-common.spec
+++ b/pki/dogtag/common/pki-common.spec
@@ -1,6 +1,6 @@
 Name:           pki-common
 Version:        1.3.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dogtag Certificate System - PKI Common Framework
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -38,6 +38,11 @@ Requires:       velocity
 
 Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
 
+%if 0%{?rhel}
+# For EPEL, override the '_sharedstatedir' macro on RHEL
+%define         _sharedstatedir    /var/lib
+%endif
+
 %description
 Dogtag Certificate System is an enterprise software system designed
 to manage enterprise Public Key Infrastructure (PKI) deployments.
@@ -108,6 +113,10 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}-%{version}/
 
 %changelog
+* Tue Apr 6 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.4-2
+- Bugzilla Bug #568787 - pki-ca fails to create SSL connectors
+- Bugzilla Bug #573038 - Unable to login on Dogtag EPEL installation
+
 * Mon Mar 22 2010 Christina Fu <cfu@redhat.com> 1.3.4-1
 - Bugzilla Bug #522343 Add asynchronous key recovery mode
 
diff --git a/pki/dogtag/config-ext/build_dogtag_pki b/pki/dogtag/config-ext/build_dogtag_pki
index 318ae485c..75647a7ad 100755
--- a/pki/dogtag/config-ext/build_dogtag_pki
+++ b/pki/dogtag/config-ext/build_dogtag_pki
@@ -306,7 +306,13 @@ if [ "\${OS}" != "Linux" ]; then
     exit 255
 fi
 
-ant -f config/release.xml -Dproduct.ui.flavor.prefix=\${PKI_PRODUCT_UI_FLAVOR_PREFIX} -Dproduct.prefix=\${PKI_PRODUCT_PREFIX} -Dproduct=\${PKI_PRODUCT} -Dversion=\${PKI_VERSION} -Dbasedir=. -Dspecfile=\${SPECFILE} -Dtarget=\${BUILD_TARGET} \${RELEASE_TARGET}
+if [ -f /etc/fedora-release ]; then
+	# Script is being executed on Fedora
+	ant -f config/release.xml -Drhel=0 -Dproduct.ui.flavor.prefix=\${PKI_PRODUCT_UI_FLAVOR_PREFIX} -Dproduct.prefix=\${PKI_PRODUCT_PREFIX} -Dproduct=\${PKI_PRODUCT} -Dversion=\${PKI_VERSION} -Dbasedir=. -Dspecfile=\${SPECFILE} -Dtarget=\${BUILD_TARGET} \${RELEASE_TARGET}
+elif [ -f /etc/redhat-release ]; then
+	# Script is being executed on RHEL
+	ant -f config/release.xml -Drhel=1 -Dproduct.ui.flavor.prefix=\${PKI_PRODUCT_UI_FLAVOR_PREFIX} -Dproduct.prefix=\${PKI_PRODUCT_PREFIX} -Dproduct=\${PKI_PRODUCT} -Dversion=\${PKI_VERSION} -Dbasedir=. -Dspecfile=\${SPECFILE} -Dtarget=\${BUILD_TARGET} \${RELEASE_TARGET}
+fi
 
 END_OF_SCRIPT
 chmod 00755 ${PKI_RELEASE_ROOT}/${PKI_RELEASE_SCRIPT}
diff --git a/pki/dogtag/util/pki-util.spec b/pki/dogtag/util/pki-util.spec
index 3973039c2..d554f47f8 100644
--- a/pki/dogtag/util/pki-util.spec
+++ b/pki/dogtag/util/pki-util.spec
@@ -1,6 +1,6 @@
 Name:           pki-util
 Version:        1.3.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Dogtag Certificate System - PKI Utility Framework
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -25,6 +25,11 @@ Requires:       ldapjdk
 
 Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
 
+%if 0%{?rhel}
+# For EPEL, override the '_sharedstatedir' macro on RHEL
+%define         _sharedstatedir    /var/lib
+%endif
+
 %description
 Dogtag Certificate System is an enterprise software system designed
 to manage enterprise Public Key Infrastructure (PKI) deployments.
@@ -88,6 +93,10 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}-%{version}/
 
 %changelog
+* Tue Apr 6 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-6
+- Bugzilla Bug #568787 - pki-ca fails to create SSL connectors
+- Bugzilla Bug #573038 - Unable to login on Dogtag EPEL installation
+
 * Mon Jan 25 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-5
 - Created "_sharedstatedir/tomcat5/common/lib/cmsutil.jar" link
 - Created "_sharedstatedir/tomcat5/common/lib/nsutil.jar" link