Bugzilla Bug #586073 - Add new 'mod_revocator' runtime dependency to RA and TPS

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1624 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

8 files changed, 19 insertions, 7 deletions

diff --git a/pki/dogtag/CMakeLists.txt b/pki/dogtag/CMakeLists.txt
index fd04debf9..5e7771de1 100644
--- a/pki/dogtag/CMakeLists.txt
+++ b/pki/dogtag/CMakeLists.txt
@@ -1,10 +1,10 @@
 project(dogtag)
 
-if (APPLICATION_FLAVOUR_NULL_THEME)
+if (APPLICATION_FLAVOR_NULL_PKI_THEME)
     add_subdirectory(common-ui)
     add_subdirectory(ca-ui)
-endif (APPLICATION_FLAVOUR_NULL_THEME)
-if (APPLICATION_FLAVOUR_DOGTAG_THEME)
+endif (APPLICATION_FLAVOR_NULL_PKI_THEME)
+if (APPLICATION_FLAVOR_DOGTAG_PKI_THEME)
     add_subdirectory(common-ui)
     add_subdirectory(ca-ui)
     add_subdirectory(kra-ui)
@@ -13,4 +13,4 @@ if (APPLICATION_FLAVOUR_DOGTAG_THEME)
     add_subdirectory(tks-ui)
     add_subdirectory(tps-ui)
     add_subdirectory(console-ui)
-endif (APPLICATION_FLAVOUR_DOGTAG_THEME)
+endif (APPLICATION_FLAVOR_DOGTAG_PKI_THEME)
diff --git a/pki/dogtag/ca/pki-ca.spec b/pki/dogtag/ca/pki-ca.spec
index f9f47c23d..000a101d1 100644
--- a/pki/dogtag/ca/pki-ca.spec
+++ b/pki/dogtag/ca/pki-ca.spec
@@ -60,6 +60,8 @@ ant \
 rm -rf %{buildroot}
 cd dist/binary
 unzip %{name}-%{version}.zip -d %{buildroot}
+cd %{buildroot}%{_datadir}/pki/ca/conf
+mv CS.cfg.in CS.cfg
 sed -i 's/^preop.product.version=.*$/preop.product.version=%{version}/' %{buildroot}%{_datadir}/pki/ca/conf/CS.cfg
 sed -i 's/^cms.version=.*$/cms.version=%{major_version}.%{minor_version}/' %{buildroot}%{_datadir}/pki/ca/conf/CS.cfg
 mkdir -p %{buildroot}%{_localstatedir}/lock/pki/ca
diff --git a/pki/dogtag/console-ui/src/CMakeLists.txt b/pki/dogtag/console-ui/src/CMakeLists.txt
index e13ced8e9..2ff647440 100644
--- a/pki/dogtag/console-ui/src/CMakeLists.txt
+++ b/pki/dogtag/console-ui/src/CMakeLists.txt
@@ -12,8 +12,8 @@ set(console_ui_java_SRCS
 
 set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 
-add_jar(pki-console-theme ${console_ui_java_SRCS})
-install_jar(pki-console-theme ${JAVA_JAR_INSTALL_DIR})
+add_jar(pki-console-theme_en ${console_ui_java_SRCS})
+install_jar(pki-console-theme_en ${JAVA_JAR_INSTALL_DIR})
 
-set(CONSOLE_UI_JAR ${pki-console-theme_JAR_FILE} CACHE INTERNAL "console-ui jar file")
+set(CONSOLE_UI_JAR ${pki-console-theme_en_JAR_FILE} CACHE INTERNAL "console-ui jar file")
 
diff --git a/pki/dogtag/kra/pki-kra.spec b/pki/dogtag/kra/pki-kra.spec
index 808353632..ba9e8b615 100644
--- a/pki/dogtag/kra/pki-kra.spec
+++ b/pki/dogtag/kra/pki-kra.spec
@@ -69,6 +69,8 @@ ant \
 rm -rf %{buildroot}
 cd dist/binary
 unzip %{name}-%{version}.zip -d %{buildroot}
+cd %{buildroot}%{_datadir}/pki/kra/conf
+mv CS.cfg.in CS.cfg
 sed -i 's/^preop.product.version=.*$/preop.product.version=%{version}/' %{buildroot}%{_datadir}/pki/kra/conf/CS.cfg
 sed -i 's/^cms.version=.*$/cms.version=%{major_version}.%{minor_version}/' %{buildroot}%{_datadir}/pki/kra/conf/CS.cfg
 mkdir -p %{buildroot}%{_localstatedir}/lock/pki/kra
diff --git a/pki/dogtag/ocsp/pki-ocsp.spec b/pki/dogtag/ocsp/pki-ocsp.spec
index 0844d3947..63ab5e225 100644
--- a/pki/dogtag/ocsp/pki-ocsp.spec
+++ b/pki/dogtag/ocsp/pki-ocsp.spec
@@ -78,6 +78,8 @@ ant \
 rm -rf %{buildroot}
 cd dist/binary
 unzip %{name}-%{version}.zip -d %{buildroot}
+cd %{buildroot}%{_datadir}/pki/ocsp/conf
+mv CS.cfg.in CS.cfg
 sed -i 's/^preop.product.version=.*$/preop.product.version=%{version}/' %{buildroot}%{_datadir}/pki/ocsp/conf/CS.cfg
 sed -i 's/^cms.version=.*$/cms.version=%{major_version}.%{minor_version}/' %{buildroot}%{_datadir}/pki/ocsp/conf/CS.cfg
 mkdir -p %{buildroot}%{_localstatedir}/lock/pki/ocsp
diff --git a/pki/dogtag/ra/pki-ra.spec b/pki/dogtag/ra/pki-ra.spec
index 964d56ef2..d9559d8fc 100644
--- a/pki/dogtag/ra/pki-ra.spec
+++ b/pki/dogtag/ra/pki-ra.spec
@@ -75,6 +75,8 @@ ant \
 rm -rf %{buildroot}
 cd dist/binary
 unzip %{name}-%{version}.zip -d %{buildroot}
+cd %{buildroot}%{_datadir}/pki/ra/conf
+mv CS.cfg.in CS.cfg
 sed -i 's/^preop.product.version=.*$/preop.product.version=%{version}/' %{buildroot}%{_datadir}/pki/ra/conf/CS.cfg
 mkdir -p %{buildroot}%{_localstatedir}/lock/pki/ra
 mkdir -p %{buildroot}%{_localstatedir}/run/pki/ra
diff --git a/pki/dogtag/tks/pki-tks.spec b/pki/dogtag/tks/pki-tks.spec
index f861dfd5f..4c64da5ef 100644
--- a/pki/dogtag/tks/pki-tks.spec
+++ b/pki/dogtag/tks/pki-tks.spec
@@ -71,6 +71,8 @@ ant \
 rm -rf %{buildroot}
 cd dist/binary
 unzip %{name}-%{version}.zip -d %{buildroot}
+cd %{buildroot}%{_datadir}/pki/tks/conf
+mv CS.cfg.in CS.cfg
 sed -i 's/^preop.product.version=.*$/preop.product.version=%{version}/' %{buildroot}%{_datadir}/pki/tks/conf/CS.cfg
 sed -i 's/^cms.version=.*$/cms.version=%{major_version}.%{minor_version}/' %{buildroot}%{_datadir}/pki/tks/conf/CS.cfg
 mkdir -p %{buildroot}%{_localstatedir}/lock/pki/tks
diff --git a/pki/dogtag/tps/pki-tps.spec b/pki/dogtag/tps/pki-tps.spec
index 6b00141ca..ee6d65421 100644
--- a/pki/dogtag/tps/pki-tps.spec
+++ b/pki/dogtag/tps/pki-tps.spec
@@ -156,6 +156,8 @@ cd %{buildroot}%{_datadir}/pki/tps/docroot
 ln -s tokendb tus
 
 # fix version information in primary configuration file
+cd %{buildroot}%{_datadir}/pki/tps/conf
+mv CS.cfg.in CS.cfg
 sed -i 's/^preop.product.version=.*$/preop.product.version=%{version}/' %{buildroot}%{_datadir}/pki/tps/conf/CS.cfg
 
 # rename config.desktop.in --> config.desktop