diff options
-rw-r--r-- | base/ra/CMakeLists.txt | 8 | ||||
-rw-r--r-- | dogtag/CMakeLists.txt | 1 | ||||
-rw-r--r-- | specs/dogtag-pki-theme.spec | 41 |
3 files changed, 12 insertions, 38 deletions
diff --git a/base/ra/CMakeLists.txt b/base/ra/CMakeLists.txt index 79152e291..5fa62eab6 100644 --- a/base/ra/CMakeLists.txt +++ b/base/ra/CMakeLists.txt @@ -37,16 +37,16 @@ install( install( DIRECTORY - emails/ + apache/docroot/ DESTINATION - ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME}/conf + ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME}/docroot ) install( DIRECTORY - forms/ + emails/ DESTINATION - ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME}/docroot + ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME}/conf ) install( diff --git a/dogtag/CMakeLists.txt b/dogtag/CMakeLists.txt index aa4f2fc83..a39956a3d 100644 --- a/dogtag/CMakeLists.txt +++ b/dogtag/CMakeLists.txt @@ -5,7 +5,6 @@ if (APPLICATION_FLAVOR_IPA_PKI_THEME) endif (APPLICATION_FLAVOR_IPA_PKI_THEME) if (APPLICATION_FLAVOR_DOGTAG_PKI_THEME) add_subdirectory(common-ui) - add_subdirectory(ra-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 5e10a200e..ef77147e6 100644 --- a/specs/dogtag-pki-theme.spec +++ b/specs/dogtag-pki-theme.spec @@ -75,6 +75,8 @@ Conflicts: redhat-pki-ocsp-theme Conflicts: redhat-pki-ocsp-ui Conflicts: redhat-pki-tks-theme Conflicts: redhat-pki-tks-ui +Conflicts: redhat-pki-ra-theme +Conflicts: redhat-pki-ra-ui # EPEL version of Dogtag "theme" ALWAYS replaces ALL versions of IPA "theme" Obsoletes: ipa-pki-server-theme <= 9999 @@ -98,6 +100,8 @@ Obsoletes: dogtag-pki-ocsp-theme <= %{version}-%{release} Obsoletes: dogtag-pki-ocsp-ui Obsoletes: dogtag-pki-tks-theme <= %{version}-%{release} Obsoletes: dogtag-pki-tks-ui +Obsoletes: dogtag-pki-ra-theme <= %{version}-%{release} +Obsoletes: dogtag-pki-ra-ui Provides: dogtag-pki-common-theme = %{version}-%{release} Provides: pki-server-theme = %{version}-%{release} @@ -120,35 +124,13 @@ Provides: dogtag-pki-tks-theme = %{version}-%{release} Provides: pki-tks-theme = %{version}-%{release} Provides: pki-tks-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-ra-theme -Summary: Certificate System - Registration Authority 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-ra-theme -Conflicts: redhat-pki-ra-ui -%endif - -Obsoletes: dogtag-pki-ra-ui <= 9 - +Provides: dogtag-pki-ra-theme = %{version}-%{release} Provides: pki-ra-theme = %{version}-%{release} Provides: pki-ra-ui = %{version}-%{release} -%description -n dogtag-pki-ra-theme -This Registration Authority (RA) User Interface contains -the Dogtag textual and graphical user interface for the RA. +%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. @@ -255,13 +237,6 @@ chmod 755 %{buildroot}%{_datadir}/pki/tps-ui/cgi-bin/sow/cfg.pl %{_datadir}/pki/common-ui/ -%files -n dogtag-pki-ra-theme -%defattr(-,root,root,-) -%doc dogtag/ra-ui/LICENSE -%dir %{_datadir}/pki -%{_datadir}/pki/ra-ui/ - - %files -n dogtag-pki-tps-theme %defattr(-,root,root,-) %doc dogtag/tps-ui/LICENSE |