From dd566ed3c64a69801a9edf3b27f11077aa40ecef Mon Sep 17 00:00:00 2001
From: Matthew Harmsen <mharmsen@redhat.com>
Date: Mon, 23 Apr 2012 13:39:04 -0700
Subject: PKI Deployment Scriptlets

* Completed the following six 'scriptlets':
  * Dogtag 10: Python 'initialization.py' Installation Scriptlet
    (https://fedorahosted.org/pki/ticket/147)
  * Dogtag 10: Python 'instance_layout.py' Installation Scriptlet
    (https://fedorahosted.org/pki/ticket/75)
  * Dogtag 10: Python 'webserver_layout.py' Installation Scriptlet
    (https://fedorahosted.org/pki/ticket/140)
  * Dogtag 10: Python 'subsystem_layout.py' Installation Scriptlet
    (https://fedorahosted.org/pki/ticket/141)
  * Dogtag 10: Python 'war_explosion.py' Installation Scriptlet
    (https://fedorahosted.org/pki/ticket/76)
  * Dogtag 10: Python 'finalization.py' Installation Scriptlet
    (https://fedorahosted.org/pki/ticket/148)
* Created numerous PKI deployment helper utilities.
* Augmented logging to provide indentation.
* Generated logic for installation 'manifest'.
* Tested logic using '--dry_run' option and '-p' prefix options.
* Per initial review, removed numerous "constants" and consolidated
  logic into "master" dictionary.
* Corrected the following ticket:
  * Dogtag 10: Fix 'build_dogtag_pki' script to account for 'pki-deploy' RPM
    (https://fedorahosted.org/pki/ticket/138)
    Resolves Bugzilla Bug #810047 - build_dogtag_pki fails with requirements
    for pki-deploy
    (https://bugzilla.redhat.com/show_bug.cgi?id=810047)
* Created the following three 'scriptlets' as 'NOT YET IMPLEMENTED'
  place-holders:
  * Dogtag 10: Python 'security_databases.py' Installation Scriptlet
    (https://fedorahosted.org/pki/ticket/136)
  * Dogtag 10: Python 'slot_assignment.py' Installation Scriptlet
    (https://fedorahosted.org/pki/ticket/146)
  * Dogtag 10: Python 'configuration.py' Configuration Scriptlet
    (https://fedorahosted.org/pki/ticket/137)
---
 specs/pki-core.spec | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

(limited to 'specs/pki-core.spec')

diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 837557db6..a38b90497 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -63,6 +63,12 @@ BuildRequires:    jss >= 4.2.6-17
 BuildRequires:    tomcatjss >= 2.0.0
 %endif
 %endif
+# Add the following build-time requirements to support the "pki-deploy" package
+BuildRequires:    pki-common-theme
+BuildRequires:    pki-ca-theme
+BuildRequires:    pki-kra-theme
+BuildRequires:    pki-ocsp-theme
+BuildRequires:    pki-tks-theme
 
 Source0:          http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz
 
@@ -761,8 +767,8 @@ echo "D /var/run/pki/tks 0755 root root -"  >> %{buildroot}%{_sysconfdir}/tmpfil
 %{__rm} %{buildroot}%{_initrddir}/pki-ocspd
 %{__rm} %{buildroot}%{_initrddir}/pki-tksd
 # Create symlink to the pki-jndi-realm jar
-mkdir -p %{buildroot}%{_javadir}/tomcat6
-ln -s -f %{_javadir}/pki/pki-jndi-realm.jar %{buildroot}%{_javadir}/tomcat6/pki-jndi-realm.jar
+%{__mkdir_p} %{buildroot}%{_javadir}/tomcat6
+%{__ln_s} -f %{_javadir}/pki/pki-jndi-realm.jar %{buildroot}%{_javadir}/tomcat6/pki-jndi-realm.jar
 %else
 %{__rm} %{buildroot}%{_bindir}/pkicontrol
 %{__rm} -rf %{buildroot}%{_sysconfdir}/systemd/system/pki-cad.target.wants
@@ -786,6 +792,21 @@ if [ -d /etc/sysconfig/pki/%i ]; then                                        \
 fi                                                                           \
 )
 
+# Create PKI subsystem "war" files
+for subsystem in ca kra ocsp tks; do
+    echo "Constructing '${subsystem}.war' . . ."
+    %{__mkdir_p} %{buildroot}%{_datadir}/pki/${subsystem}/war
+    %{__cp} -r %{_datadir}/pki/common-ui/admin %{buildroot}%{_datadir}/pki/${subsystem}/war
+    %{__cp} -r %{_datadir}/pki/common-ui/css %{buildroot}%{_datadir}/pki/${subsystem}/war
+    %{__cp} -r %{_datadir}/pki/common-ui/img %{buildroot}%{_datadir}/pki/${subsystem}/war
+    %{__cp} -r %{_datadir}/pki/${subsystem}-ui/webapps/${subsystem}/* %{buildroot}%{_datadir}/pki/${subsystem}/war
+    %{__cp} -r %{buildroot}%{_datadir}/pki/${subsystem}/webapps/${subsystem}/WEB-INF %{buildroot}%{_datadir}/pki/${subsystem}/war
+    cd %{buildroot}%{_datadir}/pki/${subsystem}/war
+    jar -cvMf ../${subsystem}.war *
+    %{__rm} -rf %{buildroot}%{_datadir}/pki/${subsystem}/war/*
+    %{__mv} ../${subsystem}.war %{buildroot}%{_datadir}/pki/${subsystem}/war
+done
+
 %pre -n pki-selinux
 %saveFileContext targeted
 
@@ -1216,8 +1237,9 @@ fi
 %{_datadir}/pki/ca/emails/
 %dir %{_datadir}/pki/ca/profiles
 %{_datadir}/pki/ca/profiles/ca/
-%{_datadir}/pki/ca/webapps/
 %{_datadir}/pki/ca/setup/
+%{_datadir}/pki/ca/war/
+%{_datadir}/pki/ca/webapps/
 %dir %{_localstatedir}/lock/pki/ca
 %dir %{_localstatedir}/run/pki/ca
 %if 0%{?fedora} >= 15
@@ -1245,6 +1267,7 @@ fi
 %dir %{_datadir}/pki/kra
 %{_datadir}/pki/kra/conf/
 %{_datadir}/pki/kra/setup/
+%{_datadir}/pki/kra/war/
 %{_datadir}/pki/kra/webapps/
 %dir %{_localstatedir}/lock/pki/kra
 %dir %{_localstatedir}/run/pki/kra
@@ -1273,6 +1296,7 @@ fi
 %dir %{_datadir}/pki/ocsp
 %{_datadir}/pki/ocsp/conf/
 %{_datadir}/pki/ocsp/setup/
+%{_datadir}/pki/ocsp/war/
 %{_datadir}/pki/ocsp/webapps/
 %dir %{_localstatedir}/lock/pki/ocsp
 %dir %{_localstatedir}/run/pki/ocsp
@@ -1301,6 +1325,7 @@ fi
 %dir %{_datadir}/pki/tks
 %{_datadir}/pki/tks/conf/
 %{_datadir}/pki/tks/setup/
+%{_datadir}/pki/tks/war/
 %{_datadir}/pki/tks/webapps/
 %dir %{_localstatedir}/lock/pki/tks
 %dir %{_localstatedir}/run/pki/tks
-- 
cgit