summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2011-01-06 23:55:39 +0000
committermharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2011-01-06 23:55:39 +0000
commit81b802dea554ca492f3a1d50c07deccc566635fd (patch)
tree785e1d39ef902bb6a22aaee773808c357d20f08f
parent8bf22b79ff9a5db1a85f0baffc1bd3f1bc1b5ac4 (diff)
Bugzilla Bug #667486 - Rename "null-*-theme" packages to "ipa-*-theme" packages
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1710 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
-rw-r--r--pki/CMakeLists.txt8
-rw-r--r--pki/dogtag/CMakeLists.txt4
-rw-r--r--pki/specs/ipa-pki-theme.spec2
3 files changed, 7 insertions, 7 deletions
diff --git a/pki/CMakeLists.txt b/pki/CMakeLists.txt
index 056e43477..76fc557a5 100644
--- a/pki/CMakeLists.txt
+++ b/pki/CMakeLists.txt
@@ -7,8 +7,8 @@ cmake_minimum_required(VERSION 2.6.0)
set(APPLICATION_NAME ${PROJECT_NAME})
if (BUILD_OSUTIL)
set(APPLICATION_FLAVOR_OSUTIL TRUE)
-elseif (BUILD_NULL_PKI_THEME)
- set(APPLICATION_FLAVOR_NULL_PKI_THEME TRUE)
+elseif (BUILD_IPA_PKI_THEME)
+ set(APPLICATION_FLAVOR_IPA_PKI_THEME TRUE)
elseif (BUILD_DOGTAG_PKI_THEME)
set(APPLICATION_FLAVOR_DOGTAG_PKI_THEME TRUE)
elseif (BUILD_REDHAT_PKI_THEME)
@@ -30,7 +30,7 @@ elseif (BUILD_PKI_CONSOLE)
elseif (BUILD_PKI_MIGRATE)
set(APPLICATION_FLAVOR_PKI_MIGRATE TRUE)
elseif (BUILD_IPA_PKI)
- set(APPLICATION_FLAVOR_NULL_PKI_THEME TRUE)
+ set(APPLICATION_FLAVOR_IPA_PKI_THEME TRUE)
set(APPLICATION_FLAVOR_PKI_CORE TRUE)
elseif (BUILD_DOGTAG_PKI)
set(APPLICATION_FLAVOR_DOGTAG_PKI_THEME TRUE)
@@ -136,7 +136,7 @@ if (APPLICATION_FLAVOR_OSUTIL OR
endif ()
# 'Themes' MUST be "mutually-exclusive"!
-if (APPLICATION_FLAVOR_NULL_PKI_THEME)
+if (APPLICATION_FLAVOR_IPA_PKI_THEME)
add_subdirectory(dogtag)
elseif (APPLICATION_FLAVOR_DOGTAG_PKI_THEME)
add_subdirectory(dogtag)
diff --git a/pki/dogtag/CMakeLists.txt b/pki/dogtag/CMakeLists.txt
index 5e7771de1..d83f91591 100644
--- a/pki/dogtag/CMakeLists.txt
+++ b/pki/dogtag/CMakeLists.txt
@@ -1,9 +1,9 @@
project(dogtag)
-if (APPLICATION_FLAVOR_NULL_PKI_THEME)
+if (APPLICATION_FLAVOR_IPA_PKI_THEME)
add_subdirectory(common-ui)
add_subdirectory(ca-ui)
-endif (APPLICATION_FLAVOR_NULL_PKI_THEME)
+endif (APPLICATION_FLAVOR_IPA_PKI_THEME)
if (APPLICATION_FLAVOR_DOGTAG_PKI_THEME)
add_subdirectory(common-ui)
add_subdirectory(ca-ui)
diff --git a/pki/specs/ipa-pki-theme.spec b/pki/specs/ipa-pki-theme.spec
index d0899a275..ab1ad9ae7 100644
--- a/pki/specs/ipa-pki-theme.spec
+++ b/pki/specs/ipa-pki-theme.spec
@@ -146,7 +146,7 @@ This package is used by the Certificate System utilized by IPA.
%build
%{__mkdir_p} build
cd build
-%cmake -DBUILD_NULL_PKI_THEME:BOOL=ON ..
+%cmake -DBUILD_IPA_PKI_THEME:BOOL=ON ..
%{__make} VERBOSE=1 %{?_smp_mflags}