[pki-core/f18] TRAC Ticket 481 - Build pki-core 10.0.1
Ade Lee
vakwetu at fedoraproject.org
Tue Jan 15 18:26:02 UTC 2013
commit bd84f3eff92cc94928efcceb1296e86725438b65
Author: Ade Lee <alee at redhat.com>
Date: Tue Jan 15 13:25:58 2013 -0500
TRAC Ticket 481 - Build pki-core 10.0.1
.gitignore | 1 +
pki-core.spec | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
sources | 2 +-
3 files changed, 76 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2136e94..20a21e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
/pki-core-10.0.0.b2.tar.gz
/pki-core-10.0.0.b3.tar.gz
/pki-core-10.0.0.tar.gz
+/pki-core-10.0.1.tar.gz
diff --git a/pki-core.spec b/pki-core.spec
index ab6ddd0..9e50e46 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -4,8 +4,8 @@ distutils.sysconfig import get_python_lib; print(get_python_lib())")}
distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Name: pki-core
-Version: 10.0.0
-Release: 2%{?dist}
+Version: 10.0.1
+Release: 1%{?dist}
Summary: Certificate System - PKI Core Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -36,10 +36,18 @@ BuildRequires: resteasy >= 2.3.2-1
BuildRequires: junit
BuildRequires: jpackage-utils >= 0:1.7.5-10
+%if 0%{?rhel} || 0%{?fedora} >= 19
+BuildRequires: jss >= 4.2.6-28
+%else
BuildRequires: jss >= 4.2.6-24
+%endif
BuildRequires: systemd-units
-BuildRequires: tomcatjss >= 7.0.0-3
-
+%if 0%{?rhel} || 0%{?fedora} >= 19
+BuildRequires: tomcatjss >= 7.1.0
+%endif
+%if 0%{?fedora} == 18
+BuildRequires: tomcatjss >= 7.0.0-4
+%endif
%if ! 0%{?rhel} && 0%{?fedora} <= 17
BuildRequires: tomcatjss >= 6.0.2
BuildRequires: selinux-policy-devel >= 3.10.0-151
@@ -135,7 +143,11 @@ Group: System Environment/Libraries
Requires: java >= 1:1.6.0
Requires: nss
Requires: jpackage-utils >= 0:1.7.5-10
+%if 0%{?rhel} || 0%{?fedora} >= 19
+Requires: jss >= 4.2.6-28
+%else
Requires: jss >= 4.2.6-24
+%endif
Provides: symkey = %{version}-%{release}
@@ -170,13 +182,16 @@ Requires: java >= 1:1.6.0
Requires: javassist
Requires: jettison
Requires: ldapjdk
-Requires: %{_javadir}/xalan-j2.jar
-Requires: %{_javadir}/xalan-j2-serializer.jar
-Requires: %{_javadir}/xerces-j2.jar
-Requires: %{_javadir}/xml-commons-apis.jar
-Requires: %{_javadir}/xml-commons-resolver.jar
+Requires: xalan-j2
+Requires: xerces-j2
+Requires: xml-commons-apis
+Requires: xml-commons-resolver
Requires: jpackage-utils >= 0:1.7.5-10
+%if 0%{?rhel} || 0%{?fedora} >= 19
+Requires: jss >= 4.2.6-28
+%else
Requires: jss >= 4.2.6-24
+%endif
%if 0%{?rhel}
Requires: resteasy-base
%else
@@ -255,7 +270,15 @@ Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
Requires: tomcat >= 7.0.27
-Requires: tomcatjss >= 7.0.0-3
+%if 0%{?rhel} || 0%{?fedora} >= 19
+Requires: tomcatjss >= 7.1.0
+%endif
+%if 0%{?fedora} == 18
+Requires: tomcatjss >= 7.0.0-4
+%endif
+%if ! 0%{?rhel} && 0%{?fedora} <= 17
+Requires: tomcatjss >= 6.0.2
+%endif
%description -n pki-server
The PKI Server Framework is required by the following four PKI subsystems:
@@ -480,6 +503,13 @@ cd build
cd build
%{__make} install DESTDIR=%{buildroot} INSTALL="install -p"
+# Fedora 18 and 17: Substitute 'tomcat7jss.jar' for 'tomcatjss.jar'
+%if 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
+%endif
+
# Details:
#
# * https://fedoraproject.org/wiki/Features/var-run-tmpfs
@@ -804,6 +834,7 @@ fi
%files -n pki-server
%defattr(-,root,root,-)
+%doc base/common/THIRD_PARTY_LICENSES
%doc base/deploy/LICENSE
%{_sysconfdir}/pki/
%{_sbindir}/pkispawn
@@ -954,6 +985,39 @@ fi
%changelog
+* Tue Jan 15 2013 Ade Lee <alee at redhat.com> 10.0.1-1
+- TRAC Ticket 214 - Missing error description for duplicate user
+- TRAC Ticket 213 - Add nonces for cert revocation
+- TRAC Ticket 367 - pkidestroy does not remove connector
+- TRAC Ticket #430 - License for 3rd party code
+- Bugzilla Bug 839426 - [RFE] ECC CRL support for OCSP
+- Fix spec file to allow f17 to work with latest tomcatjss
+- TRAC Ticket 466 - Increase root CA validity to 20 years
+- TRAC Ticket 469 - Fix tomcatjss issue in spec files
+- TRAC Ticket 468 - pkispawn throws exception
+- TRAC Ticket 191 - Mapping HTTP Exceptions to HTTP error codes
+- TRAC Ticket 271 - Dogtag 10: Fix 'status' command in 'pkidaemon' . . .
+- TRAC Ticket 437 - Make admin cert p12 file location configurable
+- TRAC Ticket 393 - pkispawn fails when selinux is disabled
+- Punctuation and formatting changes in man pages
+- Revert to using default config file for pkidestroy
+- Hardcode setting of resteasy-lib for instance
+- TRAC Ticket 436 - Interpolation for pki_subsystem
+- TRAC Ticket 433 - Interpolation for paths
+- TRAC Ticket 435 - Identical instance id and instance name
+- TRAC Ticket 406 - Replace file dependencies with package dependencies
+
+* Wed Jan 9 2013 Matthew Harmsen <mharmsen at redhat.com> 10.0.0-5
+- TRAC Ticket #430 - License for 3rd party code
+
+* Fri Jan 4 2013 Matthew Harmsen <mharmsen at redhat.com> 10.0.0-4
+- TRAC Ticket #469 - Dogtag 10: Fix tomcatjss issue in pki-core.spec and
+ dogtag-pki.spec . . .
+- TRAC Ticket #468 - pkispawn throws exception
+
+* Wed Dec 12 2012 Ade Lee <alee at redhat.com> 10.0.0-3
+- Replaced file dependencies with package dependencies
+
* Mon Dec 10 2012 Ade Lee <alee at redhat.com> 10.0.0-2
- Updated man pages
diff --git a/sources b/sources
index db0f348..274057c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-28f6093a25b88bd0c0ef7495ed228046 pki-core-10.0.0.tar.gz
+9179fc6a26bc85f8a5b2d65c8d9395ef pki-core-10.0.1.tar.gz
More information about the scm-commits
mailing list