Please review the attached patch which addresses: * PKI TRAC Ticket #1724 - Rebase pki-core to 10.3.x <https://fedorahosted.org/pki/ticket/1724>
This was tested to see if it would build "10.3.0" (3 digits) as well as "10.3.0.a1" (4 digits).
From 668bf1d09f5dc0d63c12fc94962545447b9409f8 Mon Sep 17 00:00:00 2001 From: Matthew Harmsen <[email protected]> Date: Fri, 4 Mar 2016 19:54:03 -0700 Subject: [PATCH] Rebase to 10.3.x - PKI TRAC Ticket #1724 - Rebase pki-core to 10.3.x --- base/javadoc/CMakeLists.txt | 15 +++++++++++++-- scripts/compose_dogtag_pki_theme_packages | 2 +- scripts/compose_pki_console_packages | 2 +- scripts/compose_pki_core_packages | 2 +- specs/dogtag-pki-theme.spec | 7 +++++-- specs/dogtag-pki.spec | 7 +++++-- specs/pki-console.spec | 7 +++++-- specs/pki-core.spec | 17 +++++++++++++++-- 8 files changed, 46 insertions(+), 13 deletions(-) diff --git a/base/javadoc/CMakeLists.txt b/base/javadoc/CMakeLists.txt index 09aa410..1341935 100644 --- a/base/javadoc/CMakeLists.txt +++ b/base/javadoc/CMakeLists.txt @@ -62,6 +62,17 @@ if(NOT (${Javadoc_VERSION_MINOR} LESS 8)) set(doclintstr "-Xdoclint:none") endif(NOT (${Javadoc_VERSION_MINOR} LESS 8)) +# NOTE: The following should generally be set to "". +# +# For "alpha" releases, it will be set to ".a1", ".a2", etc. +# For "beta" releases, it will be set to ".b1", ".b2", etc. +# +if (NOT DEFINED APPLICATION_VERSION_PHASE) + set(JAVADOC_APPLICATION_VERSION ${APPLICATION_VERSION}) +else (NOT DEFINED APPLICATION_VERSION_PHASE) + set(JAVADOC_APPLICATION_VERSION ${APPLICATION_VERSION}.${APPLICATION_VERSION_PHASE}) +endif(NOT DEFINED APPLICATION_VERSION_PHASE) + javadoc(pki-javadoc SOURCEPATH ${CMAKE_SOURCE_DIR}/base/util/src @@ -69,7 +80,7 @@ javadoc(pki-javadoc ${CMAKE_SOURCE_DIR}/base/java-tools/src ${CMAKE_SOURCE_DIR}/base/server/cms/src DEST - ${CMAKE_CURRENT_BINARY_DIR}/javadoc/pki-${APPLICATION_VERSION} + ${CMAKE_CURRENT_BINARY_DIR}/javadoc/pki-${JAVADOC_APPLICATION_VERSION} SUBPACKAGES com.netscape.certsrv com.netscape.cms @@ -100,7 +111,7 @@ javadoc(pki-javadoc install( DIRECTORY - ${CMAKE_CURRENT_BINARY_DIR}/javadoc/pki-${APPLICATION_VERSION} + ${CMAKE_CURRENT_BINARY_DIR}/javadoc/pki-${JAVADOC_APPLICATION_VERSION} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/javadoc ) diff --git a/scripts/compose_dogtag_pki_theme_packages b/scripts/compose_dogtag_pki_theme_packages index d6e2680..96f391a 100755 --- a/scripts/compose_dogtag_pki_theme_packages +++ b/scripts/compose_dogtag_pki_theme_packages @@ -31,7 +31,7 @@ PKI_PWD=`pwd` ## DOGTAG_PKI_THEME="dogtag-pki-theme" -DOGTAG_PKI_THEME_VERSION="10.3.0" +DOGTAG_PKI_THEME_VERSION="10.3.0.a1" ## diff --git a/scripts/compose_pki_console_packages b/scripts/compose_pki_console_packages index a5d799b..681ca35 100755 --- a/scripts/compose_pki_console_packages +++ b/scripts/compose_pki_console_packages @@ -31,7 +31,7 @@ PKI_PWD=`pwd` ## PKI_CONSOLE="pki-console" -PKI_CONSOLE_VERSION="10.3.0" +PKI_CONSOLE_VERSION="10.3.0.a1" ## diff --git a/scripts/compose_pki_core_packages b/scripts/compose_pki_core_packages index d1fa43b..f8479e0 100755 --- a/scripts/compose_pki_core_packages +++ b/scripts/compose_pki_core_packages @@ -30,7 +30,7 @@ PKI_PWD=`pwd` ## PKI_CORE="pki-core" -PKI_CORE_VERSION="10.3.0" +PKI_CORE_VERSION="10.3.0.a1" ## diff --git a/specs/dogtag-pki-theme.spec b/specs/dogtag-pki-theme.spec index e9abc54..c2abc30 100644 --- a/specs/dogtag-pki-theme.spec +++ b/specs/dogtag-pki-theme.spec @@ -1,6 +1,6 @@ Name: dogtag-pki-theme -Version: 10.3.0 -Release: 0.1%{?dist} +Version: 10.3.0.a1 +Release: 1%{?dist} Summary: Certificate System - Dogtag PKI Theme Components URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -166,6 +166,9 @@ cd build %changelog +* Fri Mar 4 2016 Dogtag Team <[email protected]> 10.3.0.a1-1 +- Build for F24 alpha + * Sat Aug 8 2015 Dogtag Team <[email protected]> 10.3.0-0.1 - Updated version number to 10.3.0-0.1 diff --git a/specs/dogtag-pki.spec b/specs/dogtag-pki.spec index bf19686..10c98ba 100644 --- a/specs/dogtag-pki.spec +++ b/specs/dogtag-pki.spec @@ -1,7 +1,7 @@ Summary: Dogtag Public Key Infrastructure (PKI) Suite Name: dogtag-pki -Version: 10.3.0 -Release: 0.1%{?dist} +Version: 10.3.0.a1 +Release: 1%{?dist} # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2 License: GPLv2 and LGPLv2 URL: http://pki.fedoraproject.org/ @@ -94,6 +94,9 @@ rm -rf %{buildroot} %doc README %changelog +* Fri Mar 4 2016 Dogtag Team <[email protected]> 10.3.0.a1-1 +- Build for F24 alpha + * Sat Aug 8 2015 Dogtag Team <[email protected]> 10.3.0-0.1 - Updated version number to 10.3.0-0.1 diff --git a/specs/pki-console.spec b/specs/pki-console.spec index fdf8529..1841667 100644 --- a/specs/pki-console.spec +++ b/specs/pki-console.spec @@ -1,6 +1,6 @@ Name: pki-console -Version: 10.3.0 -Release: 0.1%{?dist} +Version: 10.3.0.a1 +Release: 1%{?dist} Summary: Certificate System - PKI Console URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -91,6 +91,9 @@ cd build %changelog +* Fri Mar 4 2016 Dogtag Team <[email protected]> 10.3.0.a1-1 +- Build for F24 alpha + * Sat Aug 8 2015 Dogtag Team <[email protected]> 10.3.0-0.1 - Updated version number to 10.3.0-0.1 diff --git a/specs/pki-core.spec b/specs/pki-core.spec index a46190b..74a3f74 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -42,8 +42,8 @@ %define pki_homedir /usr/share/pki Name: pki-core -Version: 10.3.0 -Release: 0.5%{?dist} +Version: 10.3.0.a1 +Release: 1%{?dist} Summary: Certificate System - PKI Core Components URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -164,6 +164,13 @@ Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/%{ Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/%{release}/%{name}-%{version}%{?prerel}.tar.gz %endif +# Obtain version phase number (e. g. - used by "alpha", "beta", etc.) +# +# NOTE: For "alpha" releases, will be ".a1", ".a2", etc. +# For "beta" releases, will be ".b1", ".b2", etc. +# +%define version_phase "%(echo `echo %{version} | awk -F. '{ print $4 }'`)" + %global saveFileContext() \ if [ -s /etc/selinux/config ]; then \ . %{_sysconfdir}/selinux/config; \ @@ -723,6 +730,9 @@ cd build -DBUILD_PKI_CORE:BOOL=ON \ -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \ -DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \ +%if %{version_phase} + -DAPPLICATION_VERSION_PHASE="%{version_phase}" \ +%endif %if ! %{with_tomcat7} -DWITH_TOMCAT7:BOOL=OFF \ %endif @@ -1095,6 +1105,9 @@ systemctl daemon-reload %endif # %{with server} %changelog +* Fri Mar 4 2016 Dogtag Team <[email protected]> 10.3.0.a1-1 +- Build for F24 alpha + * Tue Mar 1 2016 Dogtag Team <[email protected]> 10.3.0-0.5 - PKI Trac Ticket #1399 - Move java components out of pki-base -- 2.5.0
_______________________________________________ Pki-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/pki-devel
