mharmsen pushed to pki-core (master). "PKI TRAC Ticket #985: Release Dogtag 10.2.3"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Apr 24 03:44:30 UTC 2015
>From af0980e15769fe39dfff4e362f0d988ee2a02cda Mon Sep 17 00:00:00 2001
From: Matthew Harmsen <mharmsen at redhat.com>
Date: Thu, 23 Apr 2015 21:44:08 -0600
Subject: PKI TRAC Ticket #985: Release Dogtag 10.2.3
diff --git a/.gitignore b/.gitignore
index f4367f6..33774a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
/pki-core-10.1.0.tar.gz
/pki-core-10.2.0.tar.gz
/pki-core-10.2.1.tar.gz
+/pki-core-10.2.3.tar.gz
diff --git a/pki-core.spec b/pki-core.spec
index 5953469..30b1179 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -1,22 +1,44 @@
+# Python
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-Name: pki-core
-Version: 10.2.1
-Release: 1%{?dist}
-Summary: Certificate System - PKI Core Components
-URL: http://pki.fedoraproject.org/
-License: GPLv2
-Group: System Environment/Daemons
+# Tomcat
+%if 0%{?fedora} >= 23
+%define with_tomcat7 0
+%define with_tomcat8 1
+%else
+# 0%{?rhel} || 0%{?fedora} <= 22
+%define with_tomcat7 1
+%define with_tomcat8 0
+%endif
+
+# RESTEasy
+%if 0%{?rhel}
+%define resteasy_lib /usr/share/java/resteasy-base
+%else
+# 0%{?fedora}
+%define resteasy_lib /usr/share/java/resteasy
+%endif
+# Dogtag
%bcond_without server
%bcond_without javadoc
+
# ignore unpackaged files from native 'tpsclient'
# REMINDER: Remove this '%%define' once 'tpsclient' is rewritten as a Java app
%define _unpackaged_files_terminate_build 0
+
+Name: pki-core
+Version: 10.2.3
+Release: 1%{?dist}
+Summary: Certificate System - PKI Core Components
+URL: http://pki.fedoraproject.org/
+License: GPLv2
+Group: System Environment/Daemons
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake >= 2.8.9-1
@@ -27,18 +49,21 @@ BuildRequires: ldapjdk
BuildRequires: apache-commons-cli
BuildRequires: apache-commons-codec
BuildRequires: apache-commons-io
+BuildRequires: apache-commons-lang
BuildRequires: jakarta-commons-httpclient
BuildRequires: nspr-devel
BuildRequires: nss-devel >= 3.14.3
+BuildRequires: nuxwdog-client-java >= 1.0.2
BuildRequires: openldap-devel
BuildRequires: pkgconfig
BuildRequires: policycoreutils
+BuildRequires: python-lxml
BuildRequires: python-sphinx
BuildRequires: velocity
BuildRequires: xalan-j2
BuildRequires: xerces-j2
-%if 0%{?rhel}
+%if 0%{?rhel}
# 'resteasy-base' is a subset of the complete set of
# 'resteasy' packages and consists of what is needed to
# support the PKI Restful interface on RHEL platforms
@@ -49,8 +74,19 @@ BuildRequires: resteasy-base-jaxrs >= 3.0.6-1
BuildRequires: resteasy-base-jaxrs-api >= 3.0.6-1
BuildRequires: resteasy-base-jackson-provider >= 3.0.6-1
%else
+%if 0%{?fedora} >= 22
+# Starting from Fedora 22, resteasy packages were split into
+# subpackages.
+BuildRequires: resteasy-atom-provider >= 3.0.6-7
+BuildRequires: resteasy-client >= 3.0.6-7
+BuildRequires: resteasy-jaxb-provider >= 3.0.6-7
+BuildRequires: resteasy-core >= 3.0.6-7
+BuildRequires: resteasy-jaxrs-api >= 3.0.6-7
+BuildRequires: resteasy-jackson-provider >= 3.0.6-7
+%else
BuildRequires: resteasy >= 3.0.6-2
%endif
+%endif
%if ! 0%{?rhel}
BuildRequires: pylint
@@ -65,7 +101,7 @@ BuildRequires: junit
BuildRequires: jpackage-utils >= 0:1.7.5-10
BuildRequires: jss >= 4.2.6-35
BuildRequires: systemd-units
-BuildRequires: tomcatjss >= 7.1.1
+BuildRequires: tomcatjss >= 7.1.2
# additional build requirements needed to build native 'tpsclient'
# REMINDER: Revisit these once 'tpsclient' is rewritten as a Java app
@@ -222,7 +258,6 @@ Requires: apache-commons-logging
Requires: jakarta-commons-httpclient
Requires: java-headless >= 1:1.7.0
Requires: javassist
-Requires: jackson-jaxrs-json-provider
Requires: jpackage-utils >= 0:1.7.5-10
Requires: jss >= 4.2.6-35
Requires: ldapjdk
@@ -230,7 +265,7 @@ Requires: python-ldap
Requires: python-lxml
Requires: python-requests >= 1.1.0-3
-%if 0%{?rhel}
+%if 0%{?rhel}
# 'resteasy-base' is a subset of the complete set of
# 'resteasy' packages and consists of what is needed to
# support the PKI Restful interface on RHEL platforms
@@ -241,7 +276,7 @@ Requires: resteasy-base-jaxrs >= 3.0.6-1
Requires: resteasy-base-jaxrs-api >= 3.0.6-1
Requires: resteasy-base-jackson-provider >= 3.0.6-1
%else
-%if 0%{?fedora} >= 22
+%if 0%{?fedora} >= 22
# Starting from Fedora 22, resteasy packages were split into
# subpackages.
Requires: resteasy-atom-provider >= 3.0.6-7
@@ -311,6 +346,7 @@ Obsoletes: pki-silent < %{version}-%{release}
Requires: java-headless >= 1:1.7.0
Requires: net-tools
+Requires: nuxwdog-client-java >= 1.0.2
Requires: perl(File::Slurp)
Requires: policycoreutils
Requires: openldap-clients
@@ -318,7 +354,7 @@ Requires: pki-base = %{version}-%{release}
Requires: pki-tools = %{version}-%{release}
Requires: policycoreutils-python
-%if 0%{?fedora} >= 21
+%if 0%{?fedora} >= 21
Requires: selinux-policy-targeted >= 3.13.1-9
%else
# 0%{?rhel} || 0%{?fedora} < 21
@@ -330,6 +366,15 @@ Obsoletes: pki-selinux
Requires: tomcat >= 7.0.54
%else
Requires: tomcat >= 7.0.47
+%if 0%{?fedora} >= 23
+Requires: tomcat-el-3.0-api
+Requires: tomcat-jsp-2.3-api
+Requires: tomcat-servlet-3.1-api
+%else
+Requires: tomcat-el-2.2-api
+Requires: tomcat-jsp-2.2-api
+Requires: tomcat-servlet-3.0-api
+%endif
%endif
Requires: velocity
@@ -337,7 +382,7 @@ Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
-Requires: tomcatjss >= 7.1.1
+Requires: tomcatjss >= 7.1.2
%description -n pki-server
The PKI Server Framework is required by the following four PKI subsystems:
@@ -575,10 +620,15 @@ cd build
-DBUILD_PKI_CORE:BOOL=ON \
-DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
-DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \
-%if 0%{?rhel}
- -DRESTEASY_LIB=/usr/share/java/resteasy-base \
-%else
- -DRESTEASY_LIB=/usr/share/java/resteasy \
+%if ! %{with_tomcat7}
+ -DWITH_TOMCAT7:BOOL=OFF \
+%endif
+%if ! %{with_tomcat8}
+ -DWITH_TOMCAT8:BOOL=OFF \
+%endif
+ -DRESTEASY_LIB=%{resteasy_lib} \
+%if ! %{with server}
+ -DWITH_SERVER:BOOL=OFF \
%endif
%if ! %{with server}
-DWITH_SERVER:BOOL=OFF \
@@ -588,7 +638,7 @@ cd build
%endif
..
%{__make} VERBOSE=1 %{?_smp_mflags} all
-# %{__make} VERBOSE=1 %{?_smp_mflags} test
+# %{__make} VERBOSE=1 %{?_smp_mflags} unit-test
%install
@@ -596,23 +646,32 @@ 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
+# Create symlinks for admin console (TPS does not use admin console)
+for subsystem in ca kra ocsp tks; do
+ %{__mkdir_p} %{buildroot}%{_datadir}/pki/$subsystem/webapps/$subsystem/admin
+ ln -s %{_datadir}/pki/server/webapps/pki/admin/console %{buildroot}%{_datadir}/pki/$subsystem/webapps/$subsystem/admin
+done
+
+# Create symlinks for subsystem libraries
+for subsystem in ca kra ocsp tks tps; do
+ %{__mkdir_p} %{buildroot}%{_datadir}/pki/$subsystem/webapps/$subsystem/WEB-INF/lib
+ ln -s %{_javadir}/pki/pki-nsutil.jar %{buildroot}%{_datadir}/pki/$subsystem/webapps/$subsystem/WEB-INF/lib
+ ln -s %{_javadir}/pki/pki-cmsutil.jar %{buildroot}%{_datadir}/pki/$subsystem/webapps/$subsystem/WEB-INF/lib
+ ln -s %{_javadir}/pki/pki-certsrv.jar %{buildroot}%{_datadir}/pki/$subsystem/webapps/$subsystem/WEB-INF/lib
+ ln -s %{_javadir}/pki/pki-cms.jar %{buildroot}%{_datadir}/pki/$subsystem/webapps/$subsystem/WEB-INF/lib
+ ln -s %{_javadir}/pki/pki-cmscore.jar %{buildroot}%{_datadir}/pki/$subsystem/webapps/$subsystem/WEB-INF/lib
+ ln -s %{_javadir}/pki/pki-cmsbundle.jar %{buildroot}%{_datadir}/pki/$subsystem/webapps/$subsystem/WEB-INF/lib
+ ln -s %{_javadir}/pki/pki-$subsystem.jar %{buildroot}%{_datadir}/pki/$subsystem/webapps/$subsystem/WEB-INF/lib
+done
+
%if %{with server}
%if ! 0%{?rhel}
-# Scanning the python code with pylint. A return value of 0 represents there are no
-# errors or warnings reported by pylint.
+# Scanning the python code with pylint.
sh ../pylint-build-scan.sh %{buildroot} `pwd`
-if [ $? -eq 1 ]; then
+if [ $? -ne 0 ]; then
+ echo "pylint failed. RC: $?"
exit 1
fi
%endif
@@ -685,6 +744,7 @@ echo "Upgrading server at `/bin/date`." >> /var/log/pki/pki-server-upgrade-%{ver
/sbin/pki-server-upgrade --silent >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
echo >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
+systemctl daemon-reload
## %preun -n pki-server
## NOTE: At this time, NO attempt has been made to update ANY PKI subsystem
@@ -783,6 +843,8 @@ echo >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
%{_sysconfdir}/pki/default.cfg
%{_sbindir}/pkispawn
%{_sbindir}/pkidestroy
+%{_sbindir}/pki-server
+%{_sbindir}/pki-server-nuxwdog
%{_sbindir}/pki-server-upgrade
#%{_bindir}/pki-setup-proxy
%{python_sitelib}/pki/server/
@@ -875,6 +937,28 @@ echo >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
%endif # %{with server}
%changelog
+* Thu Apr 23 2015 Dogtag Team <pki-devel at redhat.com> 10.2.3-1
+- Update release number for release build
+
+* Thu Apr 9 2015 Dogtag Team <pki-devel at redhat.com> 10.2.3-0.1
+- Reverted version number back to 10.2.3-0.1
+- Added support for Tomcat 8.
+
+* Mon Apr 6 2015 Dogtag Team <pki-devel at redhat.com> 10.3.0-0.1
+- Updated version number to 10.3.0-0.1
+
+* Wed Mar 18 2015 Dogtag Team <pki-devel at redhat.com> 10.2.3-0.1
+- Updated version number to 10.2.3-0.1
+
+* Tue Mar 17 2015 Dogtag Team <pki-devel at redhat.com> 10.2.2-1
+- Update release number for release build
+
+* Thu Jan 8 2015 Dogtag Team <pki-devel at redhat.com> 10.2.2-0.1
+- Updated version number to 10.2.2-0.1
+- Moved web application deployment locations.
+- Updated Resteasy and Jackson dependencies.
+- Added missing python-lxml build dependency.
+
* Thu Jan 8 2015 Dogtag Team <pki-devel at redhat.com> 10.2.1-1
- Update release number for release build
diff --git a/sources b/sources
index 2efd6e6..869a8b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f9447a62a4f8f4b0f6cdf8c479384a28 pki-core-10.2.1.tar.gz
+906678c44a4ba207725096feeca7b40a pki-core-10.2.3.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/pki-core.git/commit/?h=master&id=af0980e15769fe39dfff4e362f0d988ee2a02cda
More information about the scm-commits
mailing list