diff options
Diffstat (limited to 'base/kra')
-rw-r--r-- | base/kra/setup/CMakeLists.txt | 2 | ||||
-rw-r--r-- | base/kra/shared/conf/CMakeLists.txt | 4 | ||||
-rw-r--r-- | base/kra/shared/conf/CS.cfg.in | 4 | ||||
-rw-r--r-- | base/kra/src/pki-kra.mf | 3 |
4 files changed, 4 insertions, 9 deletions
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} |