[pki-core] Fix build failure - Bugzilla #1103220

Tue Jul 1 12:19:01 UTC 2014

commit f0fe62951eb020390cf0c0c8a29b59f89a3259ba
Author: Ade Lee <alee at redhat.com>
Date:   Tue Jul 1 20:16:56 2014 +0800

    Fix build failure - Bugzilla #1103220

 pki-core.spec |   45 ++++++++++++++++++++++++++++++++++++++-------
 sources       |    2 +-
 2 files changed, 39 insertions(+), 8 deletions(-)
---

diff --git a/pki-core.spec b/pki-core.spec
index 84d1acf..1c50267 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.2.0
-Release:          0.3%{?dist}
+Release:          0.4%{?dist}
 Summary:          Certificate System - PKI Core Components
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -38,12 +38,13 @@ BuildRequires:    resteasy-base-atom-provider
 BuildRequires:    resteasy-base-jaxb-provider
 BuildRequires:    resteasy-base-jaxrs
 BuildRequires:    resteasy-base-jaxrs-api
-BuildRequires:    resteasy-base-jettison-provider
+BuildRequires:    resteasy-base-jackson-provider
 %else
-BuildRequires:    resteasy >= 3.0.1-3
+BuildRequires:    resteasy >= 3.0.6-2
 %endif
 
 BuildRequires:    pylint
+BuildRequires:    python-nss
 BuildRequires:    python-requests
 BuildRequires:    libselinux-python
 BuildRequires:    policycoreutils-python
@@ -188,7 +189,7 @@ Requires:         apache-commons-lang
 Requires:         apache-commons-logging
 Requires:         java-headless >= 1:1.7.0
 Requires:         javassist
-Requires:         jettison
+Requires:         jackson-jaxrs-json-provider
 Requires:         jpackage-utils >= 0:1.7.5-10
 Requires:         jss >= 4.2.6-28
 Requires:         ldapjdk
@@ -200,9 +201,9 @@ Requires:    resteasy-base-atom-provider
 Requires:    resteasy-base-jaxb-provider
 Requires:    resteasy-base-jaxrs
 Requires:    resteasy-base-jaxrs-api
-Requires:    resteasy-base-jettison-provider
+Requires:    resteasy-base-jackson-provider
 %else
-Requires:         resteasy >= 3.0.1-3
+Requires:         resteasy >= 3.0.6-2
 %endif
 Requires:         xalan-j2
 Requires:         xerces-j2
@@ -268,6 +269,7 @@ Requires:         policycoreutils
 Requires:         openldap-clients
 Requires:         pki-base = %{version}-%{release}
 Requires:         pki-tools = %{version}-%{release}
+Requires:         policycoreutils-python
 
 Requires:         selinux-policy-base >= 3.11.1-43
 Obsoletes:        pki-selinux
@@ -521,6 +523,16 @@ cd build
 cd build
 %{__make} install DESTDIR=%{buildroot} INSTALL="install -p"
 
+# Create symlinks for TPS web application
+%{__mkdir_p} %{buildroot}%{_datadir}/pki/tps/webapps/tps/WEB-INF/lib
+ln -s %{_javadir}/pki/pki-nsutil.jar %{buildroot}%{_datadir}/pki/tps/webapps/tps/WEB-INF/lib
+ln -s %{_javadir}/pki/pki-cmsutil.jar %{buildroot}%{_datadir}/pki/tps/webapps/tps/WEB-INF/lib
+ln -s %{_javadir}/pki/pki-certsrv.jar %{buildroot}%{_datadir}/pki/tps/webapps/tps/WEB-INF/lib
+ln -s %{_javadir}/pki/pki-cms.jar %{buildroot}%{_datadir}/pki/tps/webapps/tps/WEB-INF/lib
+ln -s %{_javadir}/pki/pki-cmscore.jar %{buildroot}%{_datadir}/pki/tps/webapps/tps/WEB-INF/lib
+ln -s %{_javadir}/pki/pki-cmsbundle.jar %{buildroot}%{_datadir}/pki/tps/webapps/tps/WEB-INF/lib
+ln -s %{_javadir}/pki/pki-tps.jar %{buildroot}%{_datadir}/pki/tps/webapps/tps/WEB-INF/lib
+
 %if %{with server}
 
 # Scanning the python code with pylint. A return value of 0 represents there are no
@@ -827,6 +839,7 @@ fi
 %{_datadir}/pki/VERSION
 %{_datadir}/pki/etc/
 %{_datadir}/pki/upgrade/
+%{_datadir}/pki/key/templates
 %dir %{_sysconfdir}/pki
 %config(noreplace) %{_sysconfdir}/pki/pki.conf
 %dir %{_javadir}/pki
@@ -874,6 +887,12 @@ fi
 %{_javadir}/pki/pki-tools.jar
 %{_datadir}/pki/java-tools/
 %{_mandir}/man1/pki.1.gz
+%{_mandir}/man1/pki-cert.1.gz
+%{_mandir}/man1/pki-client.1.gz
+%{_mandir}/man1/pki-group.1.gz
+%{_mandir}/man1/pki-key.1.gz
+%{_mandir}/man1/pki-securitydomain.1.gz
+%{_mandir}/man1/pki-user.1.gz
 
 
 %if %{with server}
@@ -882,6 +901,7 @@ fi
 %defattr(-,root,root,-)
 %doc base/common/THIRD_PARTY_LICENSES
 %doc base/server/LICENSE
+%doc base/server/README
 %{_sysconfdir}/pki/default.cfg
 %{_sbindir}/pkispawn
 %{_sbindir}/pkidestroy
@@ -982,6 +1002,8 @@ fi
 %{_datadir}/pki/tps/conf/
 %{_datadir}/pki/tps/setup/
 %{_datadir}/pki/tps/webapps/
+%{_mandir}/man5/pki-tps-connector.5.gz
+%{_mandir}/man5/pki-tps-profile.5.gz
 
 %if %{with javadoc}
 %files -n pki-javadoc
@@ -992,6 +1014,9 @@ fi
 %endif # %{with server}
 
 %changelog
+* Tue Jul 1 2014 Ade Lee <alee at redhat.com> - 10.2.0-0.4
+- Update rawhide build
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10.2.0-0.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -999,8 +1024,14 @@ fi
 - Use Requires: java-headless rebuild (#1067528)
 
 * Fri Nov 22 2013 Dogtag Team <pki-devel at redhat.com> 10.2.0-0.1
-- Updated version number to 10.2.0-0.1.
 - Added option to build without server packages.
+- Replaced Jettison with Jackson.
+- Added python-nss build requirement
+- Bugzilla Bug #1057959 - pkispawn requires policycoreutils-python
+- TRAC Ticket #840 - pkispawn requires policycoreutils-python
+- Updated requirements for resteasy
+- Added template files for archive, retrieve and generate key
+  requests to the client package.
 
 * Fri Nov 15 2013 Ade Lee <alee at redhat.com> 10.1.0-1
 - Trac Ticket 788 - Clean up spec files
diff --git a/sources b/sources
index 1ae947a..fa203a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-191fc3ae010710439244a00fe8168aba  pki-core-10.2.0.tar.gz
+07ebbb27a9b18879ecb03e5b5a095429  pki-core-10.2.0.tar.gz
