[pki-core/f19] Create 10.0.3-2 build
Ade Lee
vakwetu at fedoraproject.org
Fri Jun 14 16:05:37 UTC 2013
commit 232d7863822ff24277cf77704a53390b0e769a7e
Author: Ade Lee <alee at redhat.com>
Date: Fri Jun 14 12:05:29 2013 -0400
Create 10.0.3-2 build
pki-core.spec | 10 +++++++---
sources | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/pki-core.spec b/pki-core.spec
index bd7d005..f4e50df 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -5,7 +5,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Name: pki-core
Version: 10.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Certificate System - PKI Core Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -520,7 +520,7 @@ chmod 644 %{buildroot}%{_mandir}/man5/*
chmod 644 %{buildroot}%{_mandir}/man8/*
# Fedora 18 and 17: Substitute 'tomcat7jss.jar' for 'tomcatjss.jar'
-%if 0%{?fedora} <= 18
+%if ! 0%{?rhel} && 0%{?fedora} <= 18
sed -i -e 's/grant codeBase "file:\/usr\/share\/java\/tomcatjss.jar" {/grant codeBase "file:\/usr\/share\/java\/tomcat7jss.jar" {/' %{buildroot}%{_datadir}/pki/server/conf/pki.policy
sed -i -e 's/pki_tomcatjss_jar=\/usr\/share\/java\/tomcatjss.jar/pki_tomcatjss_jar=\/usr\/share\/java\/tomcat7jss.jar/' %{buildroot}%{_sysconfdir}/pki/default.cfg
sed -i -e 's/ \[tomcatjss.jar\]=\${java_dir}\/tomcatjss.jar/ \[tomcatjss.jar\]=\${java_dir}\/tomcat7jss.jar/' %{buildroot}%{_datadir}/pki/scripts/operations
@@ -610,7 +610,7 @@ end
%post -n pki-base
-%if 0%{?fedora} <= 18
+%if ! 0%{?rhel} && 0%{?fedora} <= 18
if [ "`uname -i`" == "x86_64" ]
then
sed -i -e 's/^JNI_JAR_DIR=.*$/JNI_JAR_DIR=\/usr\/lib64\/java/' %{_datadir}/pki/etc/pki.conf
@@ -1078,6 +1078,10 @@ fi
%changelog
+* Mon Jun 10 2013 Ade Lee <alee at redhat.com> 10.0.3-2
+- TRAC Ticket 646 - PKCS12Export fails on F19
+- Bugzilla Bug 961522 - allows key to be exported
+
* Thu Jun 6 2013 Ade Lee <alee at redhat.com> 10.0.3-1
- Change release number for official release.
diff --git a/sources b/sources
index ce907c0..c3d913d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-36fc06073b4a012a4c5ddbeba2d0bfa2 pki-core-10.0.3.tar.gz
+11f4d603f8686ff31b95eedd9caa9e97 pki-core-10.0.3.tar.gz
More information about the scm-commits
mailing list