diff options
| -rw-r--r-- | base/tps/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | dogtag/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | specs/dogtag-pki-theme.spec | 48 |
3 files changed, 26 insertions, 37 deletions
diff --git a/base/tps/CMakeLists.txt b/base/tps/CMakeLists.txt index 10c4d8efd..4e6a922d2 100644 --- a/base/tps/CMakeLists.txt +++ b/base/tps/CMakeLists.txt @@ -92,6 +92,20 @@ install( ) install( + DIRECTORY + apache/cgi-bin + DESTINATION + ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME} +) + +install( + DIRECTORY + apache/docroot + DESTINATION + ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME} +) + +install( FILES forms/index.html DESTINATION diff --git a/dogtag/CMakeLists.txt b/dogtag/CMakeLists.txt index a39956a3d..2561495e1 100644 --- a/dogtag/CMakeLists.txt +++ b/dogtag/CMakeLists.txt @@ -5,6 +5,5 @@ if (APPLICATION_FLAVOR_IPA_PKI_THEME) endif (APPLICATION_FLAVOR_IPA_PKI_THEME) if (APPLICATION_FLAVOR_DOGTAG_PKI_THEME) add_subdirectory(common-ui) - add_subdirectory(tps-ui) add_subdirectory(console-ui) endif (APPLICATION_FLAVOR_DOGTAG_PKI_THEME) diff --git a/specs/dogtag-pki-theme.spec b/specs/dogtag-pki-theme.spec index ef77147e6..934dc423d 100644 --- a/specs/dogtag-pki-theme.spec +++ b/specs/dogtag-pki-theme.spec @@ -7,7 +7,7 @@ Name: dogtag-pki-theme Version: 10.0.0 -Release: %{?relprefix}8%{?prerel}%{?dist} +Release: %{?relprefix}9%{?prerel}%{?dist} Summary: Certificate System - Dogtag PKI Theme Components URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -77,6 +77,8 @@ Conflicts: redhat-pki-tks-theme Conflicts: redhat-pki-tks-ui Conflicts: redhat-pki-ra-theme Conflicts: redhat-pki-ra-ui +Conflicts: redhat-pki-tps-theme +Conflicts: redhat-pki-tps-ui # EPEL version of Dogtag "theme" ALWAYS replaces ALL versions of IPA "theme" Obsoletes: ipa-pki-server-theme <= 9999 @@ -102,6 +104,8 @@ Obsoletes: dogtag-pki-tks-theme <= %{version}-%{release} Obsoletes: dogtag-pki-tks-ui Obsoletes: dogtag-pki-ra-theme <= %{version}-%{release} Obsoletes: dogtag-pki-ra-ui +Obsoletes: dogtag-pki-tps-theme <= %{version}-%{release} +Obsoletes: dogtag-pki-tps-ui Provides: dogtag-pki-common-theme = %{version}-%{release} Provides: pki-server-theme = %{version}-%{release} @@ -128,35 +132,13 @@ Provides: dogtag-pki-ra-theme = %{version}-%{release} Provides: pki-ra-theme = %{version}-%{release} Provides: pki-ra-ui = %{version}-%{release} -%description -n dogtag-pki-server-theme -This PKI Server Framework User Interface contains -the Dogtag textual and graphical user interface for the PKI Server Framework. - -This package is used by the Dogtag Certificate System. - -%{overview} - - -%package -n dogtag-pki-tps-theme -Summary: Certificate System - Token Processing System User Interface -Group: System Environment/Base - -Requires: dogtag-pki-server-theme = %{version}-%{release} - -%if 0%{?rhel} -# EPEL version of Dogtag "theme" conflicts with all versions of Red Hat "theme" -Conflicts: redhat-pki-tps-theme -Conflicts: redhat-pki-tps-ui -%endif - -Obsoletes: dogtag-pki-tps-ui <= 9 - +Provides: dogtag-pki-tps-theme = %{version}-%{release} Provides: pki-tps-theme = %{version}-%{release} Provides: pki-tps-ui = %{version}-%{release} -%description -n dogtag-pki-tps-theme -This Token Processing System (TPS) User Interface contains -the Dogtag textual and graphical user interface for the TPS. +%description -n dogtag-pki-server-theme +This PKI Server Framework User Interface contains +the Dogtag textual and graphical user interface for the PKI Server Framework. This package is used by the Dogtag Certificate System. @@ -215,8 +197,6 @@ cd build cd build %{__make} install DESTDIR=%{buildroot} INSTALL="install -p" -chmod 755 %{buildroot}%{_datadir}/pki/tps-ui/cgi-bin/sow/cfg.pl - # NOTE: Several "theme" packages require ownership of the "/usr/share/pki" # directory because the PKI subsystems (CA, DRM, OCSP, TKS, RA, TPS) @@ -237,13 +217,6 @@ chmod 755 %{buildroot}%{_datadir}/pki/tps-ui/cgi-bin/sow/cfg.pl %{_datadir}/pki/common-ui/ -%files -n dogtag-pki-tps-theme -%defattr(-,root,root,-) -%doc dogtag/tps-ui/LICENSE -%dir %{_datadir}/pki -%{_datadir}/pki/tps-ui/ - - %files -n dogtag-pki-console-theme %defattr(-,root,root,-) %doc dogtag/console-ui/LICENSE @@ -251,6 +224,9 @@ chmod 755 %{buildroot}%{_datadir}/pki/tps-ui/cgi-bin/sow/cfg.pl %changelog +* Wed Nov 21 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.9.b3 +- Removed Dogtag RA and TPS packages. + * Tue Nov 13 2012 Ade Lee <alee@redhat.com> 10.0.0-0.8.b3 - Added needed Requires for dogtag-pki-common-theme |