Integrate 'tpsclient' back into primary TPS package

- PKI TRAC Ticket #1017 - Rename pki-tps-tomcat to pki-tps

2 files changed, 50 insertions, 137 deletions

diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 40b80dc9b..4a963814e 100644
--- a/specs/pki-core.spec
+++ b/specs/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.8%{?dist}
+Release:          0.9%{?dist}
 Summary:          Certificate System - PKI Core Components
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -13,6 +13,9 @@ Group:            System Environment/Daemons
 
 %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
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,7 +28,7 @@ BuildRequires:    apache-commons-cli
 BuildRequires:    apache-commons-codec
 BuildRequires:    apache-commons-io
 BuildRequires:    nspr-devel
-BuildRequires:    nss-devel
+BuildRequires:    nss-devel >= 3.14.3
 BuildRequires:    openldap-devel
 BuildRequires:    pkgconfig
 BuildRequires:    policycoreutils
@@ -55,6 +58,19 @@ BuildRequires:    jss >= 4.2.6-28
 BuildRequires:    systemd-units
 BuildRequires:    tomcatjss >= 7.1.0
 
+# additional build requirements needed to build native 'tpsclient'
+# REMINDER:  Revisit these once 'tpsclient' is rewritten as a Java app
+BuildRequires:    apr-devel
+BuildRequires:    apr-util-devel
+BuildRequires:    cyrus-sasl-devel
+BuildRequires:    httpd-devel >= 2.4.2
+BuildRequires:    pcre-devel
+BuildRequires:    python
+BuildRequires:    systemd
+BuildRequires:    svrcore-devel
+BuildRequires:    zlib
+BuildRequires:    zlib-devel
+
 Source0:          http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz
 
 %if 0%{?rhel}
@@ -435,15 +451,28 @@ provided by the PKI Core used by the Certificate System.
 Summary:          Certificate System - Token Processing Service
 Group:            System Environment/Daemons
 
-BuildArch:        noarch
-
 Provides:         pki-tps
+Provides:         pki-tps-client = %{version}-%{release}
+
+Obsoletes:        pki-tps-client < %{version}-%{release}
+
 Requires:         java-headless >= 1:1.7.0
 Requires:         pki-server = %{version}-%{release}
 Requires(post):   systemd-units
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
 
+# additional runtime requirements needed to run native 'tpsclient'
+# REMINDER:  Revisit these once 'tpsclient' is rewritten as a Java app
+Requires:         mod_nss
+Requires:         mod_perl
+Requires:         mod_revocator
+Requires:         nss >= 3.14.3
+Requires:         nss-tools >= 3.14.3
+Requires:         openldap-clients
+Requires:         perl-Mozilla-LDAP
+Requires:         pki-symkey = %{version}-%{release}
+
 %description -n   pki-tps-tomcat
 The Token Processing System (TPS) is an optional PKI subsystem that acts
 as a Registration Authority (RA) for authenticating and processing
@@ -460,6 +489,10 @@ Token Key Service (TKS)) to fulfill the user's requests.
 TPS also interacts with the token database, an LDAP server that stores
 information about individual tokens.
 
+The utility "tpsclient" is a test tool that interacts with TPS.  This
+tool is useful to test TPS server configs without risking an actual
+smart card.
+
 %{overview}
 
 
@@ -490,6 +523,7 @@ This package is a part of the PKI Core used by the Certificate System.
 
 %prep
 %setup -q -n %{name}-%{version}%{?prerel}
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -781,6 +815,11 @@ echo >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
 %{_datadir}/pki/tps/webapps/
 %{_mandir}/man5/pki-tps-connector.5.gz
 %{_mandir}/man5/pki-tps-profile.5.gz
+# files for native 'tpsclient'
+# REMINDER:  Remove this comment once 'tpsclient' is rewritten as a Java app
+%{_bindir}/tpsclient
+%{_libdir}/tps/libtps.so
+%{_libdir}/tps/libtokendb.so
 
 %if %{with javadoc}
 %files -n pki-javadoc
@@ -791,6 +830,13 @@ echo >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
 %endif # %{with server}
 
 %changelog
+* Fri Aug 29 2014 Matthew Harmsen <mharmsen@redhat.com> - 10.2.0-0.9
+- Merged jmagne@redhat.com's spec file changes from the stand-alone
+  'pki-tps-client' package needed to build/run the native 'tpsclient'
+  command line utility into this 'pki-core' spec file under the 'tps' package.
+- Original tps libararies must be built to support this native utility.
+- Modifies tps package from 'noarch' into 'architecture-specific' package
+
 * Wed Aug 27 2014 Matthew Harmsen <mharmsen@redhat.com> - 10.2.0-0.8
 - PKI TRAC Ticket #1127 - Remove 'pki-ra', 'pki-setup', and 'pki-silent'
   packages . . .
diff --git a/specs/pki-tps-client.spec b/specs/pki-tps-client.spec
deleted file mode 100644
index 686df1f12..000000000
--- a/specs/pki-tps-client.spec
+++ /dev/null
@@ -1,133 +0,0 @@
-Name:             pki-tps-client
-Version:          10.2.0
-Release:          0.3%{?dist}
-Summary:          Certificate System - Token Processing System
-URL:              http://pki.fedoraproject.org/
-License:          LGPLv2
-Group:            System Environment/Daemons
-
-%bcond_without    javadoc
-%define _unpackaged_files_terminate_build 0 
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:    cmake >= 2.8.9-1
-BuildRequires:    apr-devel
-BuildRequires:    apr-util-devel
-BuildRequires:    cyrus-sasl-devel
-BuildRequires:    httpd-devel >= 2.4.2
-BuildRequires:    java-devel >= 1:1.7.0
-BuildRequires:    openldap-devel
-BuildRequires:    nspr-devel
-BuildRequires:    nss-devel >= 3.14.3
-BuildRequires:    pcre-devel
-BuildRequires:    pki-server >= 10.2.0
-BuildRequires:    python
-BuildRequires:    systemd
-BuildRequires:    svrcore-devel
-BuildRequires:    zlib
-BuildRequires:    zlib-devel
-
-Requires:         java >= 1:1.7.0
-Requires:         mod_nss
-Requires:         mod_perl
-Requires:         mod_revocator
-Requires:         nss >= 3.14.3
-Requires:         nss-tools >= 3.14.3
-Requires:         openldap-clients
-Requires:         perl-Mozilla-LDAP
-Requires:         pki-server >= 10.2.0
-Requires:         pki-symkey >= 10.2.0
-
-Requires(post):   systemd-units
-Requires(preun):  systemd-units
-Requires(postun): systemd-units
-
-Source0:          http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz
-
-%global overview                                                          \
-Certificate System (CS) is an enterprise software system designed         \
-to manage enterprise Public Key Infrastructure (PKI) deployments.         \
-                                                                          \
-The Token Processing System (TPS) is an optional PKI subsystem that acts  \
-as a Registration Authority (RA) for authenticating and processing        \
-enrollment requests, PIN reset requests, and formatting requests from     \
-the Enterprise Security Client (ESC).                                     \
-                                                                          \
-The utitility "tpsclient"  is a test tool that interacts with TPS         \
-This tool is useful to test TPS server configs without risking a real     \
-smart card.                                                               \                                                                          
-%{nil}
-
-%description %{overview}
-
-
-==================================
-||  ABOUT "CERTIFICATE SYSTEM"  ||
-==================================
-${overview}
-
-
-%prep
-
-%setup -q -n %{name}-%{version}%{?prerel}
-
-cat << \EOF > %{name}-prov
-
-cat << \EOF > %{name}-req
-
-%clean
-%{__rm} -rf %{buildroot}
-
-%build
-%{__mkdir_p} build
-cd build
-%cmake -DVERSION=%{version}-%{release} \
-	-DVAR_INSTALL_DIR:PATH=/var \
-	-DBUILD_PKI_TPS:BOOL=ON \
-	-DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \
-%if 0%{?rhel}
-	-DRESTEASY_LIB=/usr/share/java/resteasy-base \
-%else
-	-DRESTEASY_LIB=/usr/share/java/resteasy \
-%endif
-%if ! %{with javadoc}
-	-DWITH_JAVADOC:BOOL=OFF \
-%endif
-	..
-%{__make} VERBOSE=1 %{?_smp_mflags}
-
-%install
-%{__rm} -rf %{buildroot}
-cd build
-%{__make} install DESTDIR=%{buildroot} INSTALL="install -p"
-
-cd %{buildroot}/%{_datadir}/pki/tps/docroot
-%{__ln_s} tokendb tus
-
-# Internal libraries for 'tps' are present in:
-#
-#     * '/usr/lib/tps'    (i386)
-#     * '/usr/lib64/tps'  (x86_64)
-#
-mkdir %{buildroot}%{_sysconfdir}/ld.so.conf.d
-echo %{_libdir}/tps > %{buildroot}%{_sysconfdir}/ld.so.conf.d/tps-%{_arch}.conf
-
-# Details:
-#
-#     * https://fedoraproject.org/wiki/Features/var-run-tmpfs
-#     * https://fedoraproject.org/wiki/Tmpfiles.d_packaging_draft
-#
-%{__mkdir_p} %{buildroot}%{_sysconfdir}/tmpfiles.d
-
-%files
-%defattr(-,root,root,-)
-%doc base/tps-client/LICENSE
-%{_bindir}/tpsclient
-%{_libdir}/tps/libtps.so
-%{_libdir}/tps/libtokendb.so
-
-%changelog
-* Mon Aug 18 2014 jmagne <jmagne@redhat.com> 10.2.0-0.3
-- Initial appearance of pki-tps-client package.
-- Package includes merely the "tpclient" command line utility.
-- Original tps libararies must be built to support such a utility.