Using RPM version number in CMake.

The RPM spec files have been modified to pass the full RPM version
number to CMake. The version number contains the product version
number, release number, milestone, and platform. The CMake scritps
will parse and use this version number to generate Java manifest
files. The product version number will be used as the specification
version and full version number will be used as the implementation
version.

Ticket #339

44 files changed, 107 insertions, 77 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf61fbc48..3bb5be00b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,9 +6,13 @@ cmake_minimum_required(VERSION 2.6.0)
 # global needed variables
 set(APPLICATION_NAME ${PROJECT_NAME})
 
-set(APPLICATION_VERSION_MAJOR "10")
-set(APPLICATION_VERSION_MINOR "0")
-set(APPLICATION_VERSION_PATCH "0")
+if (NOT ${VERSION})
+    set(VERSION "10.0.0")
+endif(NOT ${VERSION})
+
+string(REGEX REPLACE "^([0-9]+).*" "\\1" APPLICATION_VERSION_MAJOR ${VERSION})
+string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" APPLICATION_VERSION_MINOR ${VERSION})
+string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" APPLICATION_VERSION_PATCH ${VERSION})
 
 option(WITH_JAVADOC "Build with Javadoc" ON)
 
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 75a8f16a0..9d6009c16 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -7,7 +7,6 @@ include(CheckCXXSourceCompiles)
 include(TestBigEndian)
 
 set(PACKAGE ${APPLICATION_NAME})
-set(VERSION ${APPLICATION_VERSION})
 set(DATADIR ${DATA_INSTALL_DIR})
 set(LIBDIR ${LIB_INSTALL_DIR})
 set(PLUGINDIR "${PLUGIN_INSTALL_DIR}-${LIBRARY_SOVERSION}")
diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
index 310a3e3c8..c0de97171 100644
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
@@ -21,7 +21,10 @@ if (APPLICATION_FLAVOR_PKI_CORE)
         add_subdirectory(javadoc)
     endif(WITH_JAVADOC)
 
-    file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/VERSION ${APPLICATION_VERSION})
+    configure_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/VERSION
+        ${CMAKE_CURRENT_BINARY_DIR}/VERSION
+    )
 
     install(
         FILES
diff --git a/base/VERSION b/base/VERSION
new file mode 100644
index 000000000..066f31138
--- /dev/null
+++ b/base/VERSION
@@ -0,0 +1,3 @@
+Name: pki
+Specification-Version: ${APPLICATION_VERSION}
+Implementation-Version: ${VERSION}
diff --git a/base/ca/setup/CMakeLists.txt b/base/ca/setup/CMakeLists.txt
index f5f069cdb..d2a1399e6 100644
--- a/base/ca/setup/CMakeLists.txt
+++ b/base/ca/setup/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(VERSION ${APPLICATION_VERSION})
-
 install(
     FILES
         registry_instance
diff --git a/base/ca/shared/conf/CMakeLists.txt b/base/ca/shared/conf/CMakeLists.txt
index e3cef5915..419289d03 100644
--- a/base/ca/shared/conf/CMakeLists.txt
+++ b/base/ca/shared/conf/CMakeLists.txt
@@ -1,7 +1,3 @@
-set(VERSION ${APPLICATION_VERSION})
-set(MAJOR_VERSION ${APPLICATION_VERSION_MAJOR})
-set(MINOR_VERSION ${APPLICATION_VERSION_MINOR})
-
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CS.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/CS.cfg @ONLY)
 
 install(
diff --git a/base/ca/shared/conf/CS.cfg.in b/base/ca/shared/conf/CS.cfg.in
index 4d148945c..94a3e5b49 100644
--- a/base/ca/shared/conf/CS.cfg.in
+++ b/base/ca/shared/conf/CS.cfg.in
@@ -18,7 +18,7 @@ pkiremove.cert.subsystem.nickname=subsystemCert cert-[PKI_INSTANCE_ID]
 installDate=[INSTALL_TIME]
 preop.wizard.name=CA Setup Wizard
 preop.product.name=CS
-preop.product.version=@VERSION@
+preop.product.version=@APPLICATION_VERSION@
 preop.system.name=CA
 preop.system.fullname=Certificate Authority
 proxy.securePort=[PKI_PROXY_SECURE_PORT]
@@ -734,7 +734,7 @@ cmc.revokeCert.sharedSecret.class=com.netscape.cms.authentication.SharedSecret
 cmc.sharedSecret.class=com.netscape.cms.authentication.SharedSecret
 cms.passwordlist=internaldb,replicationdb
 cms.password.ignore.publishing.failure=true
-cms.version=@MAJOR_VERSION@.@MINOR_VERSION@
+cms.version=@APPLICATION_VERSION_MAJOR@.@APPLICATION_VERSION_MINOR@
 cmsgateway._000=##
 cmsgateway._001=## In the event that all Admin Certificates have been lost
 cmsgateway._002=## for a given instance, perform the following steps to
diff --git a/base/ca/src/pki-ca.mf b/base/ca/src/pki-ca.mf
index 056f7bc08..ae5a8975f 100644
--- a/base/ca/src/pki-ca.mf
+++ b/base/ca/src/pki-ca.mf
@@ -1,2 +1,3 @@
 Name: pki-ca
-Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file
+Specification-Version: ${APPLICATION_VERSION}
+Implementation-Version: ${VERSION}
diff --git a/base/common/src/pki-certsrv.mf b/base/common/src/pki-certsrv.mf
index fe2ed1ffe..0614e4d8c 100644
--- a/base/common/src/pki-certsrv.mf
+++ b/base/common/src/pki-certsrv.mf
@@ -1,2 +1,3 @@
 Name: pki-certsrv
-Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file
+Specification-Version: ${APPLICATION_VERSION}
+Implementation-Version: ${VERSION}
diff --git a/base/common/src/pki-cms.mf b/base/common/src/pki-cms.mf
index 2c6f8010f..4810f3fb0 100644
--- a/base/common/src/pki-cms.mf
+++ b/base/common/src/pki-cms.mf
@@ -1,2 +1,3 @@
 Name: pki-cms
-Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file
+Specification-Version: ${APPLICATION_VERSION}
+Implementation-Version: ${VERSION}
diff --git a/base/common/src/pki-cmsbundle.mf b/base/common/src/pki-cmsbundle.mf
index 84d6f0e7a..ee384386e 100644
--- a/base/common/src/pki-cmsbundle.mf
+++ b/base/common/src/pki-cmsbundle.mf
@@ -1,2 +1,3 @@
 Name: pki-cmsbundle
-Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file
+Specification-Version: ${APPLICATION_VERSION}
+Implementation-Version: ${VERSION}
diff --git a/base/common/src/pki-cmscore.mf b/base/common/src/pki-cmscore.mf
index 1b1a03f50..c23d7b299 100644
--- a/base/common/src/pki-cmscore.mf
+++ b/base/common/src/pki-cmscore.mf
@@ -1,2 +1,3 @@
 Name: pki-cmscore
-Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file
+Specification-Version: ${APPLICATION_VERSION}
+Implementation-Version: ${VERSION}
diff --git a/base/common/src/pki-tomcat.mf b/base/common/src/pki-tomcat.mf
index a6e4889b8..ca8d3bf1b 100644
--- a/base/common/src/pki-tomcat.mf
+++ b/base/common/src/pki-tomcat.mf
@@ -1,2 +1,3 @@
 Name: pki-tomcat
-Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file
+Specification-Version: ${APPLICATION_VERSION}
+Implementation-Version: ${VERSION}
diff --git a/base/console/src/pki-console.mf b/base/console/src/pki-console.mf
index 91ec08905..4f7799ad3 100644
--- a/base/console/src/pki-console.mf
+++ b/base/console/src/pki-console.mf
@@ -1,2 +1,3 @@
 Name: pki-console
-Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file
+Specification-Version: ${APPLICATION_VERSION}
+Implementation-Version: ${VERSION}
diff --git a/base/java-tools/src/pki-tools.mf b/base/java-tools/src/pki-tools.mf
index 3cf1821aa..712f450c0 100644
--- a/base/java-tools/src/pki-tools.mf
+++ b/base/java-tools/src/pki-tools.mf
@@ -1,2 +1,3 @@
 Name: pki-tools
-Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file
+Specification-Version: ${APPLICATION_VERSION}
+Implementation-Version: ${VERSION}
diff --git a/base/kra/setup/CMakeLists.txt b/base/kra/setup/CMakeLists.txt
index f5f069cdb..d2a1399e6 100644
--- a/base/kra/setup/CMakeLists.txt
+++ b/base/kra/setup/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(VERSION ${APPLICATION_VERSION})
-
 install(
     FILES
         registry_instance
diff --git a/base/kra/shared/conf/CMakeLists.txt b/base/kra/shared/conf/CMakeLists.txt
index e3cef5915..419289d03 100644
--- a/base/kra/shared/conf/CMakeLists.txt
+++ b/base/kra/shared/conf/CMakeLists.txt
@@ -1,7 +1,3 @@
-set(VERSION ${APPLICATION_VERSION})
-set(MAJOR_VERSION ${APPLICATION_VERSION_MAJOR})
-set(MINOR_VERSION ${APPLICATION_VERSION_MINOR})
-
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CS.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/CS.cfg @ONLY)
 
 install(
diff --git a/base/kra/shared/conf/CS.cfg.in b/base/kra/shared/conf/CS.cfg.in
index c2655fc75..28653a958 100644
--- a/base/kra/shared/conf/CS.cfg.in
+++ b/base/kra/shared/conf/CS.cfg.in
@@ -17,7 +17,7 @@ pkiremove.cert.subsystem.nickname=subsystemCert cert-[PKI_INSTANCE_ID]
 installDate=[INSTALL_TIME]
 preop.wizard.name=DRM Setup Wizard
 preop.product.name=CS
-preop.product.version=@VERSION@
+preop.product.version=@APPLICATION_VERSION@
 preop.system.name=DRM
 preop.system.fullname=Data Recovery Manager
 proxy.securePort=[PKI_PROXY_SECURE_PORT]
@@ -175,7 +175,7 @@ cmc.lraPopWitness.verify.allow=true
 cmc.revokeCert.verify=true
 cmc.revokeCert.sharedSecret.class=com.netscape.cms.authentication.SharedSecret
 cmc.sharedSecret.class=com.netscape.cms.authentication.SharedSecret
-cms.version=@MAJOR_VERSION@.@MINOR_VERSION@
+cms.version=@APPLICATION_VERSION_MAJOR@.@APPLICATION_VERSION_MINOR@
 dbs.enableSerialManagement=false
 dbs.beginRequestNumber=1
 dbs.endRequestNumber=10000000
diff --git a/base/kra/src/pki-kra.mf b/base/kra/src/pki-kra.mf
index 3234421e7..dba4e6c7c 100644
--- a/base/kra/src/pki-kra.mf
+++ b/base/kra/src/pki-kra.mf
@@ -1,2 +1,3 @@
 Name: pki-kra
-Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file
+Specification-Version: ${APPLICATION_VERSION}
+Implementation-Version: ${VERSION}
diff --git a/base/ocsp/setup/CMakeLists.txt b/base/ocsp/setup/CMakeLists.txt
index f5f069cdb..d2a1399e6 100644
--- a/base/ocsp/setup/CMakeLists.txt
+++ b/base/ocsp/setup/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(VERSION ${APPLICATION_VERSION})
-
 install(
     FILES
         registry_instance
diff --git a/base/ocsp/shared/conf/CMakeLists.txt b/base/ocsp/shared/conf/CMakeLists.txt
index e3cef5915..419289d03 100644
--- a/base/ocsp/shared/conf/CMakeLists.txt
+++ b/base/ocsp/shared/conf/CMakeLists.txt
@@ -1,7 +1,3 @@
-set(VERSION ${APPLICATION_VERSION})
-set(MAJOR_VERSION ${APPLICATION_VERSION_MAJOR})
-set(MINOR_VERSION ${APPLICATION_VERSION_MINOR})
-
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CS.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/CS.cfg @ONLY)
 
 install(
diff --git a/base/ocsp/shared/conf/CS.cfg.in b/base/ocsp/shared/conf/CS.cfg.in
index 0910d6672..79448104e 100644
--- a/base/ocsp/shared/conf/CS.cfg.in
+++ b/base/ocsp/shared/conf/CS.cfg.in
@@ -25,7 +25,7 @@ preop.admincert.profile=caAdminCert
 preop.securitydomain.admin_url=https://[PKI_MACHINE_NAME]:9445
 preop.wizard.name=OCSP Setup Wizard
 preop.product.name=CS
-preop.product.version=@VERSION@
+preop.product.version=@APPLICATION_VERSION@
 preop.system.name=OCSP
 preop.system.fullname=OCSP Responder
 proxy.securePort=[PKI_PROXY_SECURE_PORT]
@@ -159,7 +159,7 @@ cmc.lraPopWitness.verify.allow=true
 cmc.revokeCert.verify=true
 cmc.revokeCert.sharedSecret.class=com.netscape.cms.authentication.SharedSecret
 cmc.sharedSecret.class=com.netscape.cms.authentication.SharedSecret
-cms.version=@MAJOR_VERSION@.@MINOR_VERSION@
+cms.version=@APPLICATION_VERSION_MAJOR@.@APPLICATION_VERSION_MINOR@
 dbs.ldap=internaldb
 dbs.newSchemaEntryAdded=true
 debug.append=true
diff --git a/base/ocsp/src/pki-ocsp.mf b/base/ocsp/src/pki-ocsp.mf
index 999e7d992..1f436c998 100644
--- a/base/ocsp/src/pki-ocsp.mf
+++ b/base/ocsp/src/pki-ocsp.mf
@@ -1,2 +1,3 @@
 Name: pki-ocsp
-Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file
+Specification-Version: ${APPLICATION_VERSION}
+Implementation-Version: ${VERSION}
diff --git a/base/ra/doc/CMakeLists.txt b/base/ra/doc/CMakeLists.txt
index 4cebbe1c9..419289d03 100644
--- a/base/ra/doc/CMakeLists.txt
+++ b/base/ra/doc/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(VERSION ${APPLICATION_VERSION})
-
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CS.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/CS.cfg @ONLY)
 
 install(
diff --git a/base/ra/doc/CS.cfg.in b/base/ra/doc/CS.cfg.in
index 0581e3a78..702dda90b 100644
--- a/base/ra/doc/CS.cfg.in
+++ b/base/ra/doc/CS.cfg.in
@@ -190,7 +190,7 @@ conn.ca1.timeout=100
 conn.ca1.SSLOn=true
 conn.ca1.keepAlive=true
 preop.pin=[PKI_RANDOM_NUMBER]
-preop.product.version=@VERSION@
+preop.product.version=@APPLICATION_VERSION@
 preop.cert._000=#########################################
 preop.cert._001=# Installation configuration "preop" certs parameters
 preop.cert._002=#########################################
diff --git a/base/ra/setup/CMakeLists.txt b/base/ra/setup/CMakeLists.txt
index 4f9784507..0e81ca150 100644
--- a/base/ra/setup/CMakeLists.txt
+++ b/base/ra/setup/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(VERSION ${APPLICATION_VERSION})
-
 install(
     FILES
         pkidaemon_registry
diff --git a/base/silent/src/pki-silent.mf b/base/silent/src/pki-silent.mf
index 5b66b7ffc..13c91de27 100644
--- a/base/silent/src/pki-silent.mf
+++ b/base/silent/src/pki-silent.mf
@@ -1,2 +1,3 @@
 Name: pki-silent
-Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file
+Specification-Version: ${APPLICATION_VERSION}
+Implementation-Version: ${VERSION}
diff --git a/base/tks/setup/CMakeLists.txt b/base/tks/setup/CMakeLists.txt
index f5f069cdb..d2a1399e6 100644
--- a/base/tks/setup/CMakeLists.txt
+++ b/base/tks/setup/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(VERSION ${APPLICATION_VERSION})
-
 install(
     FILES
         registry_instance
diff --git a/base/tks/shared/conf/CMakeLists.txt b/base/tks/shared/conf/CMakeLists.txt
index e3cef5915..419289d03 100644
--- a/base/tks/shared/conf/CMakeLists.txt
+++ b/base/tks/shared/conf/CMakeLists.txt
@@ -1,7 +1,3 @@
-set(VERSION ${APPLICATION_VERSION})
-set(MAJOR_VERSION ${APPLICATION_VERSION_MAJOR})
-set(MINOR_VERSION ${APPLICATION_VERSION_MINOR})
-
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CS.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/CS.cfg @ONLY)
 
 install(
diff --git a/base/tks/shared/conf/CS.cfg.in b/base/tks/shared/conf/CS.cfg.in
index f641e026f..7f11c4b18 100644
--- a/base/tks/shared/conf/CS.cfg.in
+++ b/base/tks/shared/conf/CS.cfg.in
@@ -25,7 +25,7 @@ preop.securitydomain.admin_url=https://[PKI_MACHINE_NAME]:9445
 preop.wizard.name=TKS Setup Wizard
 preop.system.name=TKS
 preop.product.name=CS
-preop.product.version=@VERSION@
+preop.product.version=@APPLICATION_VERSION@
 preop.system.fullname=Token Key Service
 proxy.securePort=[PKI_PROXY_SECURE_PORT]
 proxy.unsecurePort=[PKI_PROXY_UNSECURE_PORT]
@@ -152,7 +152,7 @@ cmc.lraPopWitness.verify.allow=true
 cmc.revokeCert.verify=true
 cmc.revokeCert.sharedSecret.class=com.netscape.cms.authentication.SharedSecret
 cmc.sharedSecret.class=com.netscape.cms.authentication.SharedSecret
-cms.version=@MAJOR_VERSION@.@MINOR_VERSION@
+cms.version=@APPLICATION_VERSION_MAJOR@.@APPLICATION_VERSION_MINOR@
 dbs.ldap=internaldb
 dbs.newSchemaEntryAdded=true
 debug.append=true
diff --git a/base/tks/src/pki-tks.mf b/base/tks/src/pki-tks.mf
index a9f3a3e50..38d85b998 100644
--- a/base/tks/src/pki-tks.mf
+++ b/base/tks/src/pki-tks.mf
@@ -1,2 +1,3 @@
 Name: pki-tks
-Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file
+Specification-Version: ${APPLICATION_VERSION}
+Implementation-Version: ${VERSION}
diff --git a/base/tps/doc/CMakeLists.txt b/base/tps/doc/CMakeLists.txt
index 4cebbe1c9..419289d03 100644
--- a/base/tps/doc/CMakeLists.txt
+++ b/base/tps/doc/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(VERSION ${APPLICATION_VERSION})
-
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CS.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/CS.cfg @ONLY)
 
 install(
diff --git a/base/tps/doc/CS.cfg.in b/base/tps/doc/CS.cfg.in
index 64dadc6a6..93e53fdde 100644
--- a/base/tps/doc/CS.cfg.in
+++ b/base/tps/doc/CS.cfg.in
@@ -362,7 +362,7 @@ channel.defKeyIndex=0
 #            * channel.appletMemorySize=5000
 #
 preop.pin=[PKI_RANDOM_NUMBER]
-preop.product.version=@VERSION@
+preop.product.version=@APPLICATION_VERSION@
 preop.cert._000=#########################################
 preop.cert._001=# Installation configuration "preop" certs parameters
 preop.cert._002=#########################################
diff --git a/base/tps/setup/CMakeLists.txt b/base/tps/setup/CMakeLists.txt
index 4f9784507..0e81ca150 100644
--- a/base/tps/setup/CMakeLists.txt
+++ b/base/tps/setup/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(VERSION ${APPLICATION_VERSION})
-
 install(
     FILES
         pkidaemon_registry
diff --git a/base/util/src/pki-cmsutil.mf b/base/util/src/pki-cmsutil.mf
index 87382b9aa..dace8f426 100644
--- a/base/util/src/pki-cmsutil.mf
+++ b/base/util/src/pki-cmsutil.mf
@@ -1,2 +1,3 @@
 Name: pki-cmsutil
-Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file
+Specification-Version: ${APPLICATION_VERSION}
+Implementation-Version: ${VERSION}
diff --git a/base/util/src/pki-nsutil.mf b/base/util/src/pki-nsutil.mf
index 272200d67..483d46756 100644
--- a/base/util/src/pki-nsutil.mf
+++ b/base/util/src/pki-nsutil.mf
@@ -1,2 +1,3 @@
 Name: pki-nsutil
-Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file
+Specification-Version: ${APPLICATION_VERSION}
+Implementation-Version: ${VERSION}
diff --git a/scripts/compose_pki_core_packages b/scripts/compose_pki_core_packages
index fa1ed3102..dc13b63b0 100755
--- a/scripts/compose_pki_core_packages
+++ b/scripts/compose_pki_core_packages
@@ -148,6 +148,7 @@ else
 	mkdir -p ${PKI_CORE_BASE_DIR}
 	cd ${PKI_BASE_DIR}
 	cp -p ${PKI_BASE_MANIFEST} ${PKI_CORE_BASE_DIR}
+	cp -p VERSION ${PKI_CORE_BASE_DIR}
 	for component in "${PKI_COMPONENT_LIST}" ;
 	do
 		find ${component}             \
diff --git a/specs/dogtag-pki-theme.spec b/specs/dogtag-pki-theme.spec
index abd436af1..e7699d220 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}1%{?prerel}%{?dist}
+Release:          %{?relprefix}2%{?prerel}%{?dist}
 Summary:          Certificate System - Dogtag PKI Theme Components
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -281,7 +281,11 @@ This package is used by the Dogtag Certificate System.
 %build
 %{__mkdir_p} build
 cd build
-%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_DOGTAG_PKI_THEME:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} ..
+%cmake -DVERSION=%{version}-%{release} \
+	-DVAR_INSTALL_DIR:PATH=/var \
+	-DBUILD_DOGTAG_PKI_THEME:BOOL=ON \
+	-DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
+	..
 %{__make} VERBOSE=1 %{?_smp_mflags}
 
 
@@ -357,6 +361,9 @@ chmod 755 %{buildroot}%{_datadir}/pki/tps-ui/cgi-bin/sow/cfg.pl
 
 
 %changelog
+* Sun Sep 30 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.2.a1
+- Modified CMake to use RPM version number
+
 * Wed Feb  1 2012 Nathan Kinder <nkinder@redhat.com> 10.0.0-0.1.a1
 - Updated package version number
 
diff --git a/specs/ipa-pki-theme.spec b/specs/ipa-pki-theme.spec
index 1b9ef9eba..5ebc8ce71 100644
--- a/specs/ipa-pki-theme.spec
+++ b/specs/ipa-pki-theme.spec
@@ -7,7 +7,7 @@
 
 Name:             ipa-pki-theme
 Version:          10.0.0
-Release:          %{?relprefix}1%{?prerel}%{?dist}
+Release:          %{?relprefix}2%{?prerel}%{?dist}
 Summary:          Certificate System - IPA PKI Theme Components
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -109,7 +109,9 @@ This package is used by the Certificate System utilized by IPA.
 %build
 %{__mkdir_p} build
 cd build
-%cmake -DBUILD_IPA_PKI_THEME:BOOL=ON ..
+%cmake -DVERSION=%{version}-%{release} \
+	-DBUILD_IPA_PKI_THEME:BOOL=ON \
+	..
 %{__make} VERBOSE=1 %{?_smp_mflags}
 
 
@@ -133,6 +135,9 @@ cd build
 
 
 %changelog
+* Sun Sep 30 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.2.a1
+- Modified CMake to use RPM version number
+
 * Wed Feb  1 2012 Nathan Kinder <nkinder@redhat.com> 10.0.0-0.1.a1
 - Updated package version number
 
diff --git a/specs/pki-console.spec b/specs/pki-console.spec
index 5821db181..d2d892a3d 100644
--- a/specs/pki-console.spec
+++ b/specs/pki-console.spec
@@ -7,7 +7,7 @@
 
 Name:             pki-console
 Version:          10.0.0
-Release:          %{?relprefix}7%{?prerel}%{?dist}
+Release:          %{?relprefix}8%{?prerel}%{?dist}
 Summary:          Certificate System - PKI Console
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -79,7 +79,8 @@ following "Mutually-Exclusive" PKI Theme packages:
 %build
 %{__mkdir_p} build
 cd build
-%cmake -DVAR_INSTALL_DIR:PATH=/var \
+%cmake -DVERSION=%{version}-%{release} \
+	-DVAR_INSTALL_DIR:PATH=/var \
     -DBUILD_PKI_CONSOLE:BOOL=ON \
     -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
     %{?_without_javadoc:-DWITH_JAVADOC:BOOL=OFF} \
@@ -101,6 +102,9 @@ cd build
 
 
 %changelog
+* Sun Sep 30 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.8.a1
+- Modified CMake to use RPM version number
+
 * Thu Aug 30 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.7.a1
 - Added runtime dependency on pki-base
 
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index feef82ab2..788afdb53 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -14,7 +14,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name:             pki-core
 Version:          10.0.0
-Release:          %{?relprefix}35%{?prerel}%{?dist}
+Release:          %{?relprefix}36%{?prerel}%{?dist}
 Summary:          Certificate System - PKI Core Components
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -641,7 +641,8 @@ This package is a part of the PKI Core used by the Certificate System.
 %build
 %{__mkdir_p} build
 cd build
-%cmake -DVAR_INSTALL_DIR:PATH=/var \
+%cmake -DVERSION=%{version}-%{release} \
+	-DVAR_INSTALL_DIR:PATH=/var \
 	-DBUILD_PKI_CORE:BOOL=ON \
 	-DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
 	-DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \
@@ -1298,6 +1299,9 @@ fi
 
 
 %changelog
+* Sun Sep 30 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.36.a1
+- Modified CMake to use RPM version number
+
 * Tue Sep 25 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.35.a1
 - Added VERSION file
 
diff --git a/specs/pki-migrate.spec b/specs/pki-migrate.spec
index 9047e3b2b..8334b928b 100644
--- a/specs/pki-migrate.spec
+++ b/specs/pki-migrate.spec
@@ -7,7 +7,7 @@
 
 Name:             pki-migrate
 Version:          10.0.0
-Release:          %{?relprefix}1%{?prerel}%{?dist}
+Release:          %{?relprefix}2%{?prerel}%{?dist}
 Summary:          Red Hat Certificate System - PKI Migration Scripts
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -57,7 +57,10 @@ hardware platforms as well as earlier versions of this operating system.
 %build
 %{__mkdir_p} build
 cd build
-%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_MIGRATE:BOOL=ON ..
+%cmake -DVERSION=%{version}-%{release} \
+	-DVAR_INSTALL_DIR:PATH=/var \
+	-DBUILD_PKI_MIGRATE:BOOL=ON \
+	..
 %{__make} VERBOSE=1 %{?_smp_mflags}
 
 
@@ -75,6 +78,9 @@ cd build
 
 
 %changelog
+* Sun Sep 30 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.2.a1
+- Modified CMake to use RPM version number
+
 * Wed Feb  1 2012 Nathan Kinder <nkinder@redhat.com> 10.0.0-0.1.a1
 - Updated package version number
 
diff --git a/specs/pki-ra.spec b/specs/pki-ra.spec
index 5d5315538..c6debdacc 100644
--- a/specs/pki-ra.spec
+++ b/specs/pki-ra.spec
@@ -7,7 +7,7 @@
 
 Name:             pki-ra
 Version:          10.0.0
-Release:          %{?relprefix}7%{?prerel}%{?dist}
+Release:          %{?relprefix}8%{?prerel}%{?dist}
 Summary:          Certificate System - Registration Authority
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -111,8 +111,11 @@ chmod +x %{__perl_requires}
 %build
 %{__mkdir_p} build
 cd build
-%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_RA:BOOL=ON .. \
-    -DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir}
+%cmake -DVERSION=%{version}-%{release} \
+	-DVAR_INSTALL_DIR:PATH=/var \
+	-DBUILD_PKI_RA:BOOL=ON \
+	-DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \
+	..
 %{__make} VERBOSE=1 %{?_smp_mflags}
 
 
@@ -245,6 +248,9 @@ fi
 
 
 %changelog
+* Sun Sep 30 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.8.a1
+- Modified CMake to use RPM version number
+
 * Mon Sep 24 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.7.a1
 - Merged pki-setup into pki-server
 
diff --git a/specs/pki-tps.spec b/specs/pki-tps.spec
index 967d2d9ab..b5d811f5b 100644
--- a/specs/pki-tps.spec
+++ b/specs/pki-tps.spec
@@ -7,7 +7,7 @@
 
 Name:             pki-tps
 Version:          10.0.0
-Release:          %{?relprefix}7%{?prerel}%{?dist}
+Release:          %{?relprefix}8%{?prerel}%{?dist}
 Summary:          Certificate System - Token Processing System
 URL:              http://pki.fedoraproject.org/
 License:          LGPLv2
@@ -134,8 +134,11 @@ chmod +x %{__perl_requires}
 %build
 %{__mkdir_p} build
 cd build
-%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_TPS:BOOL=ON .. \
-    -DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir}
+%cmake -DVERSION=%{version}-%{release} \
+	-DVAR_INSTALL_DIR:PATH=/var \
+	-DBUILD_PKI_TPS:BOOL=ON \
+	-DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \
+	..
 %{__make} VERBOSE=1 %{?_smp_mflags}
 
 
@@ -280,6 +283,9 @@ fi
 
 
 %changelog
+* Sun Sep 30 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.8.a1
+- Modified CMake to use RPM version number
+
 * Mon Sep 24 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.7.a1
 - Merged pki-setup into pki-server