[pki-core] Trac Ticket 694 - create 10.0.4-1 builds
Ade Lee
vakwetu at fedoraproject.org
Thu Jul 25 17:54:07 UTC 2013
commit 5b0e173ef7bbb956d82e6b2471087bb8e90acff8
Author: Ade Lee <alee at redhat.com>
Date: Thu Jul 25 13:54:00 2013 -0400
Trac Ticket 694 - create 10.0.4-1 builds
.gitignore | 1 +
pki-core.spec | 113 ++++++++++++++++++++++++++++++++++++++++++++++-----------
sources | 2 +-
3 files changed, 94 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 73d8163..93f4dc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
/pki-core-10.0.1.tar.gz
/pki-core-10.0.2.tar.gz
/pki-core-10.0.3.tar.gz
+/pki-core-10.0.4.tar.gz
diff --git a/pki-core.spec b/pki-core.spec
index 3927ce5..7b31735 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.3
-Release: 3%{?dist}
+Version: 10.0.4
+Release: 1%{?dist}
Summary: Certificate System - PKI Core Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -18,7 +18,9 @@ BuildRequires: zip
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: redhat-rpm-config
BuildRequires: ldapjdk
+BuildRequires: apache-commons-cli
BuildRequires: apache-commons-codec
+BuildRequires: apache-commons-io
BuildRequires: nspr-devel
BuildRequires: nss-devel
BuildRequires: openldap-devel
@@ -29,7 +31,11 @@ BuildRequires: xalan-j2
BuildRequires: xerces-j2
%if 0%{?rhel}
-BuildRequires: resteasy-base
+BuildRequires: resteasy-base-atom-provider
+BuildRequires: resteasy-base-jaxb-provider
+BuildRequires: resteasy-base-jaxrs
+BuildRequires: resteasy-base-jaxrs-api
+BuildRequires: resteasy-base-jettison-provider
%else
BuildRequires: resteasy >= 2.3.2-1
%endif
@@ -93,17 +99,17 @@ PKI Core contains ALL top-level java-based Tomcat PKI components: \
* pki-selinux (f17 only) \
* pki-server \
* pki-ca \
- * pki-kra \
- * pki-ocsp \
- * pki-tks \
+ * pki-kra (fedora only) \
+ * pki-ocsp (fedora only) \
+ * pki-tks (fedora only) \
* pki-javadoc \
\
which comprise the following corresponding PKI subsystems: \
\
* Certificate Authority (CA) \
- * Data Recovery Manager (DRM) \
- * Online Certificate Status Protocol (OCSP) Manager \
- * Token Key Service (TKS) \
+ * Data Recovery Manager (DRM) (fedora only) \
+ * Online Certificate Status Protocol (OCSP) Manager (fedora only) \
+ * Token Key Service (TKS) (fedora only) \
\
For deployment purposes, PKI Core contains fundamental packages \
required by BOTH native-based Apache AND java-based Tomcat \
@@ -184,6 +190,7 @@ Obsoletes: pki-common < %{version}-%{release}
Obsoletes: pki-util < %{version}-%{release}
Conflicts: freeipa-server < 3.0.0
+Requires: apache-commons-cli
Requires: apache-commons-codec
Requires: apache-commons-io
Requires: apache-commons-lang
@@ -202,7 +209,11 @@ Requires: python-ldap
Requires: python-lxml
Requires: python-requests >= 1.1.0-3
%if 0%{?rhel}
-Requires: resteasy-base
+Requires: resteasy-base-atom-provider
+Requires: resteasy-base-jaxb-provider
+Requires: resteasy-base-jaxrs
+Requires: resteasy-base-jaxrs-api
+Requires: resteasy-base-jettison-provider
%else
Requires: resteasy >= 2.3.2-1
%endif
@@ -267,6 +278,7 @@ Requires: perl-Crypt-SSLeay
Requires: policycoreutils
Requires: openldap-clients
Requires: pki-base = %{version}-%{release}
+Requires: pki-symkey = %{version}-%{release}
Requires: pki-tools = %{version}-%{release}
%if ! 0%{?rhel} && 0%{?fedora} <= 17
@@ -352,6 +364,7 @@ provided by the PKI Core used by the Certificate System.
%{overview}
+%if ! 0%{?rhel}
%package -n pki-kra
Summary: Certificate System - Data Recovery Manager
Group: System Environment/Daemons
@@ -383,8 +396,10 @@ This package is one of the top-level java-based Tomcat PKI subsystems
provided by the PKI Core used by the Certificate System.
%{overview}
+%endif
+%if ! 0%{?rhel}
%package -n pki-ocsp
Summary: Certificate System - Online Certificate Status Protocol Manager
Group: System Environment/Daemons
@@ -423,8 +438,10 @@ This package is one of the top-level java-based Tomcat PKI subsystems
provided by the PKI Core used by the Certificate System.
%{overview}
+%endif
+%if ! 0%{?rhel}
%package -n pki-tks
Summary: Certificate System - Token Key Service
Group: System Environment/Daemons
@@ -433,7 +450,6 @@ BuildArch: noarch
Requires: java >= 1:1.6.0
Requires: pki-server = %{version}-%{release}
-Requires: pki-symkey = %{version}-%{release}
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -458,6 +474,7 @@ This package is one of the top-level java-based Tomcat PKI subsystems
provided by the PKI Core used by the Certificate System.
%{overview}
+%endif
%package -n pki-javadoc
@@ -505,6 +522,11 @@ cd build
%if ! 0%{?rhel} && 0%{?fedora} <= 17
-DBUILD_PKI_SELINUX:BOOL=ON \
%endif
+%if 0%{?rhel}
+ -DBUILD_PKI_KRA:BOOL=OFF \
+ -DBUILD_PKI_OCSP:BOOL=OFF \
+ -DBUILD_PKI_TKS:BOOL=OFF \
+%endif
..
%{__make} VERBOSE=1 %{?_smp_mflags} all
# %{__make} VERBOSE=1 %{?_smp_mflags} test
@@ -515,10 +537,6 @@ cd build
cd build
%{__make} install DESTDIR=%{buildroot} INSTALL="install -p"
-chmod 644 %{buildroot}%{_mandir}/man1/*
-chmod 644 %{buildroot}%{_mandir}/man5/*
-chmod 644 %{buildroot}%{_mandir}/man8/*
-
# Fedora 18 and 17: Substitute 'tomcat7jss.jar' for 'tomcatjss.jar'
%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
@@ -537,31 +555,43 @@ echo "D /var/lock/pki 0755 root root -" > %{buildroot}%{_sysconfdir}/tmpfile
echo "D /var/lock/pki/ca 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-ca.conf
echo "D /var/run/pki 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-ca.conf
echo "D /var/run/pki/ca 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-ca.conf
+%if ! 0%{?rhel}
# generate 'pki-kra.conf' under the 'tmpfiles.d' directory
echo "D /var/lock/pki 0755 root root -" > %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-kra.conf
echo "D /var/lock/pki/kra 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-kra.conf
echo "D /var/run/pki 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-kra.conf
echo "D /var/run/pki/kra 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-kra.conf
+%endif
+%if ! 0%{?rhel}
# generate 'pki-ocsp.conf' under the 'tmpfiles.d' directory
echo "D /var/lock/pki 0755 root root -" > %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-ocsp.conf
echo "D /var/lock/pki/ocsp 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-ocsp.conf
echo "D /var/run/pki 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-ocsp.conf
echo "D /var/run/pki/ocsp 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-ocsp.conf
+%endif
# generate 'pki-tomcat.conf' under the 'tmpfiles.d' directory
echo "D /var/lock/pki 0755 root root -" > %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-tomcat.conf
echo "D /var/lock/pki/tomcat 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-tomcat.conf
echo "D /var/run/pki 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-tomcat.conf
echo "D /var/run/pki/tomcat 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-tomcat.conf
+%if ! 0%{?rhel}
# generate 'pki-tks.conf' under the 'tmpfiles.d' directory
echo "D /var/lock/pki 0755 root root -" > %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-tks.conf
echo "D /var/lock/pki/tks 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-tks.conf
echo "D /var/run/pki 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-tks.conf
echo "D /var/run/pki/tks 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-tks.conf
+%endif
%{__rm} %{buildroot}%{_initrddir}/pki-cad
+%if ! 0%{?rhel}
%{__rm} %{buildroot}%{_initrddir}/pki-krad
+%endif
+%if ! 0%{?rhel}
%{__rm} %{buildroot}%{_initrddir}/pki-ocspd
+%endif
+%if ! 0%{?rhel}
%{__rm} %{buildroot}%{_initrddir}/pki-tksd
+%endif
%{__rm} -rf %{buildroot}%{_datadir}/pki/server/lib
@@ -629,7 +659,6 @@ then
else
# On RPM upgrade run system upgrade
echo "Upgrading system at `/bin/date`." >> /var/log/pki/pki-upgrade-%{version}.log 2>&1
- /sbin/pki-upgrade --remove-tracker >> /var/log/pki/pki-upgrade-%{version}.log 2>&1
/sbin/pki-upgrade --silent >> /var/log/pki/pki-upgrade-%{version}.log 2>&1
echo >> /var/log/pki/pki-upgrade-%{version}.log 2>&1
fi
@@ -693,6 +722,7 @@ fi
%fix_tomcat_log ca
+%if ! 0%{?rhel}
%post -n pki-kra
# Attempt to update ALL old "KRA" instances to "systemd"
if [ -d /etc/sysconfig/pki/kra ]; then
@@ -722,8 +752,10 @@ if [ -d /etc/sysconfig/pki/kra ]; then
fi
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
%fix_tomcat_log kra
+%endif
+%if ! 0%{?rhel}
%post -n pki-ocsp
# Attempt to update ALL old "OCSP" instances to "systemd"
if [ -d /etc/sysconfig/pki/ocsp ]; then
@@ -753,8 +785,10 @@ if [ -d /etc/sysconfig/pki/ocsp ]; then
fi
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
%fix_tomcat_log ocsp
+%endif
+%if ! 0%{?rhel}
%post -n pki-tks
# Attempt to update ALL old "TKS" instances to "systemd"
if [ -d /etc/sysconfig/pki/tks ]; then
@@ -784,6 +818,7 @@ if [ -d /etc/sysconfig/pki/tks ]; then
fi
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
%fix_tomcat_log tks
+%endif
%post -n pki-server
@@ -803,25 +838,31 @@ if [ $1 = 0 ] ; then
fi
+%if ! 0%{?rhel}
%preun -n pki-kra
if [ $1 = 0 ] ; then
/bin/systemctl --no-reload disable pki-krad.target > /dev/null 2>&1 || :
/bin/systemctl stop pki-krad.target > /dev/null 2>&1 || :
fi
+%endif
+%if ! 0%{?rhel}
%preun -n pki-ocsp
if [ $1 = 0 ] ; then
/bin/systemctl --no-reload disable pki-ocspd.target > /dev/null 2>&1 || :
/bin/systemctl stop pki-ocspd.target > /dev/null 2>&1 || :
fi
+%endif
+%if ! 0%{?rhel}
%preun -n pki-tks
if [ $1 = 0 ] ; then
/bin/systemctl --no-reload disable pki-tksd.target > /dev/null 2>&1 || :
/bin/systemctl stop pki-tksd.target > /dev/null 2>&1 || :
fi
+%endif
## %preun -n pki-server
@@ -837,25 +878,31 @@ if [ "$1" -ge "1" ] ; then
fi
+%if ! 0%{?rhel}
%postun -n pki-kra
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ "$1" -ge "1" ] ; then
/bin/systemctl try-restart pki-krad.target >/dev/null 2>&1 || :
fi
+%endif
+%if ! 0%{?rhel}
%postun -n pki-ocsp
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ "$1" -ge "1" ] ; then
/bin/systemctl try-restart pki-ocspd.target >/dev/null 2>&1 || :
fi
+%endif
+%if ! 0%{?rhel}
%postun -n pki-tks
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ "$1" -ge "1" ] ; then
/bin/systemctl try-restart pki-tksd.target >/dev/null 2>&1 || :
fi
+%endif
## %postun -n pki-server
@@ -889,6 +936,7 @@ fi
%{python_sitelib}/pki/*.pyo
%dir %{_localstatedir}/log/pki
%{_sbindir}/pki-upgrade
+%{_mandir}/man8/pki-upgrade.8.gz
%files -n pki-tools
%defattr(-,root,root,-)
@@ -922,7 +970,7 @@ fi
%{_bindir}/TokenInfo
%{_javadir}/pki/pki-tools.jar
%{_datadir}/pki/java-tools/
-%{_mandir}/man1/*
+%{_mandir}/man1/pki.1.gz
%files -n pki-server
@@ -963,8 +1011,10 @@ fi
%{_bindir}/pkisilent
%{_datadir}/pki/silent/
%{_bindir}/pkicontrol
-%{_mandir}/man5/*
-%{_mandir}/man8/*
+%{_mandir}/man5/pki_default.cfg.5.gz
+%{_mandir}/man8/pki-server-upgrade.8.gz
+%{_mandir}/man8/pkidestroy.8.gz
+%{_mandir}/man8/pkispawn.8.gz
# Details:
#
@@ -1007,6 +1057,7 @@ fi
%config(noreplace) %{_sysconfdir}/tmpfiles.d/pki-ca.conf
+%if ! 0%{?rhel}
%files -n pki-kra
%defattr(-,root,root,-)
%doc base/kra/LICENSE
@@ -1026,8 +1077,10 @@ fi
# * https://fedoraproject.org/wiki/Tmpfiles.d_packaging_draft
#
%config(noreplace) %{_sysconfdir}/tmpfiles.d/pki-kra.conf
+%endif
+%if ! 0%{?rhel}
%files -n pki-ocsp
%defattr(-,root,root,-)
%doc base/ocsp/LICENSE
@@ -1047,8 +1100,10 @@ fi
# * https://fedoraproject.org/wiki/Tmpfiles.d_packaging_draft
#
%config(noreplace) %{_sysconfdir}/tmpfiles.d/pki-ocsp.conf
+%endif
+%if ! 0%{?rhel}
%files -n pki-tks
%defattr(-,root,root,-)
%doc base/tks/LICENSE
@@ -1068,6 +1123,7 @@ fi
# * https://fedoraproject.org/wiki/Tmpfiles.d_packaging_draft
#
%config(noreplace) %{_sysconfdir}/tmpfiles.d/pki-tks.conf
+%endif
%if %{?_without_javadoc:0}%{!?_without_javadoc:1}
@@ -1078,8 +1134,23 @@ fi
%changelog
-* Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 10.0.3-3
-- Perl 5.18 rebuild
+* Thu Jul 25 2013 Ade Lee <alee at redhat.com> 10.0.4-1
+- Change release number for official release
+
+* Wed Jul 24 2013 Matthew Harmsen <mharmsen at redhat.com> 10.0.4-0.4
+- Bugzilla Bug #986506 - Need to determine RPM packages to be excluded
+ from compose . . . (exclude pki-kra, pki-ocsp, and pki-tks from rhel 7)
+
+* Wed Jul 17 2013 Endi S. Dewata <edewata at redhat.com> 10.0.4-0.3
+- Added man pages for upgrade tools.
+- Cleaned up the code to install man pages.
+
+* Tue Jul 9 2013 Ade Lee <alee at redhat.com> 10.0.4-0.2
+- Bugzilla Bug 973224 - resteasy-base must be split into subpackages
+ to simplify dependencies
+
+* Wed Jun 26 2013 Ade Lee <alee at redhat.com> 10.0.4-0.1
+- Roll release to next version
* Mon Jun 10 2013 Ade Lee <alee at redhat.com> 10.0.3-2
- TRAC Ticket 646 - PKCS12Export fails on F19
diff --git a/sources b/sources
index c3d913d..c5f018e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-11f4d603f8686ff31b95eedd9caa9e97 pki-core-10.0.3.tar.gz
+535e1225199faece2819bcb5dda710cd pki-core-10.0.4.tar.gz
More information about the scm-commits
mailing list