[pki-tks] Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . Bugzilla Bug #699809 - Convert CS

[kwright]

commit 3dff631b5e40fc8871191edff41bb5c115570c07
Author: Kevin Wright <kwright at redhat.com>
Date:   Tue Sep 13 02:51:49 2011 -0700

    Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . .
    Bugzilla Bug #699809 - Convert CS to use systemd (alee)

 .gitignore   |    1 +
 clog         |   10 +------
 pki-tks.spec |   73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 sources      |    2 +-
 4 files changed, 73 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f5ac874..856e148 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ pki-tks-1.3.3.tar.gz
 /pki-tks-9.0.1.tar.gz
 /pki-tks-9.0.2.tar.gz
 /pki-tks-9.0.3.tar.gz
+/pki-tks-9.0.6.tar.gz
diff --git a/clog b/clog
index 2e96b26..77317ae 100644
--- a/clog
+++ b/clog
@@ -1,8 +1,2 @@
-Bugzilla Bug #693815 - /var/log/tomcat6/catalina.out owned by pkiuser
-(jdennis)
-Bugzilla Bug #699837 - service command is not fully backwards
-compatible with Dogtag pki subsystems (mharmsen)
-Bugzilla Bug #649910 - Console: an auditor or agent can be added to an
-administrator group. (jmagne)
-Bugzilla Bug #669226 - Remove Legacy Build System (mharmsen)
-Updated release of 'jss'
+Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . .
+Bugzilla Bug #699809 - Convert CS to use systemd (alee)
diff --git a/pki-tks.spec b/pki-tks.spec
index a9accca..7c151bc 100644
--- a/pki-tks.spec
+++ b/pki-tks.spec
@@ -1,5 +1,5 @@
 Name:             pki-tks
-Version:          9.0.3
+Version:          9.0.6
 Release:          1%{?dist}
 Summary:          Certificate System - Token Key Service
 URL:              http://pki.fedoraproject.org/
@@ -12,21 +12,35 @@ BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    cmake
 BuildRequires:    java-devel >= 1:1.6.0
+%if 0%{?fedora} >= 16
+BuildRequires:    jpackage-utils >= 0:1.7.5-10
+%else
 BuildRequires:    jpackage-utils
+%endif
 BuildRequires:    jss >= 4.2.6-17
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
 BuildRequires:    pki-common
 BuildRequires:    pki-util
+%if 0%{?fedora} >= 16
+BuildRequires:    systemd-units
+%endif
 
 Requires:         java >= 1:1.6.0
 Requires:         pki-common
 Requires:         pki-selinux
 Requires:         pki-tks-theme
+%if 0%{?fedora} >= 16
+Requires(post):   systemd-units
+Requires(preun):  systemd-units
+Requires(postun): systemd-units
+%else 
 Requires(post):   chkconfig
 Requires(preun):  chkconfig
 Requires(preun):  initscripts
 Requires(postun): initscripts
+%endif
+
 %if 0%{?fedora} >= 15
 # Details:
 #
@@ -95,7 +109,7 @@ Additionally, Certificate System requires ONE AND ONLY ONE of the following
 %build
 %{__mkdir_p} build
 cd build
-%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_TKS:BOOL=ON ..
+%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_TKS:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} ..
 %{__make} VERBOSE=1 %{?_smp_mflags}
 
 
@@ -118,29 +132,69 @@ echo "D /var/run/pki 0755 root root -"      >> %{buildroot}%{_sysconfdir}/tmpfil
 echo "D /var/run/pki/tks 0755 root root -"  >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-tks.conf
 %endif
 
+%if 0%{?fedora} >= 16
+%{__rm} %{buildroot}%{_initrddir}/pki-tksd
+%else
+%{__rm} -rf %{buildroot}%{_sysconfdir}/systemd/system/pki-tksd.target.wants
+%{__rm} -rf %{buildroot}%{_unitdir}
+%endif
 
+%if 0%{?rhel} || 0%{?fedora} < 16
 %post
 # This adds the proper /etc/rc*.d links for the script
 /sbin/chkconfig --add pki-tksd || :
 
-
 %preun
 if [ $1 = 0 ] ; then
     /sbin/service pki-tksd stop >/dev/null 2>&1
     /sbin/chkconfig --del pki-tksd || :
 fi
 
-
 %postun
 if [ "$1" -ge "1" ] ; then
     /sbin/service pki-tksd condrestart >/dev/null 2>&1 || :
 fi
+%else 
+%post 
+# Attempt to update ALL old "TKS" instances to "systemd"
+#for inst in `ls /etc/sysconfig/pki/tks`; do
+#    if [ ! -e "/etc/systemd/system/pki-tksd.target.wants/pki-tksd@${inst}.service" ]; then
+#        ln -s "/lib/systemd/system/pki-tksd at .service"   "/etc/systemd/system/pki-tksd.target.wants/pki-tksd@${inst}.service"
+#        [ -e /var/lib/${inst}/${inst} ] && unlink /var/lib/${inst}/${inst}
+#        ln -s /usr/sbin/tomcat6-sysd /var/lib/${inst}/${inst}
+#        echo "pkicreate.systemd.servicename=pki-tksd@${inst}.service" >> /var/lib/${inst}/conf/CS.cfg
+#    fi
+#done
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+# Attempt to restart ALL updated "TKS" instances
+#if [ $1 = 2 ] ; then
+#    /bin/systemctl try-restart pki-tksd.target >/dev/null 2>&1 || :
+#fi
+ 
+%preun
+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
+
+%postun
+/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
 
 
 %files
 %defattr(-,root,root,-)
 %doc base/tks/LICENSE
+%if 0%{?fedora} >= 16
+%dir %{_sysconfdir}/systemd/system/pki-tksd.target.wants
+%{_unitdir}/pki-tksd at .service
+%{_unitdir}/pki-tksd.target
+%else 
 %{_initrddir}/pki-tksd
+%endif
 %{_javadir}/pki/pki-tks-%{version}.jar
 %{_javadir}/pki/pki-tks.jar
 %dir %{_datadir}/pki/tks
@@ -160,6 +214,17 @@ fi
 
 
 %changelog
+* Mon Sep 12 2011 Matthew Harmsen <mharmsen at redhat.com> 9.0.6-1
+- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . .
+- Bugzilla Bug #699809 - Convert CS to use systemd (alee)
+
+* Tue Sep 6 2011 Ade Lee <alee at redhat.com> 9.0.5-1
+- Bugzilla Bug #699809 - Convert CS to use systemd
+
+* Tue Aug 23 2011 Ade Lee <alee at redhat.com> 9.0.4-1
+- Bugzilla Bug #712931 - CS requires too many ports
+  to be open in the FW
+
 * Thu Jul 14 2011 Matthew Harmsen <mharmsen at redhat.com> 9.0.3-1
 - Bugzilla Bug #693815 - /var/log/tomcat6/catalina.out owned by pkiuser
   (jdennis)
diff --git a/sources b/sources
index 47ed266..46e2540 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f954c54c07b8a0bda18b751c5ba85f9  pki-tks-9.0.3.tar.gz
+b017daeb4b0752a13d6ffb57a1883e32  pki-tks-9.0.6.tar.gz