From f81718c563ea12240e161a807013acd2d6eb1f2e Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Sun, 30 Sep 2012 12:21:46 -0500 Subject: 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 --- specs/dogtag-pki-theme.spec | 11 +++++++++-- specs/ipa-pki-theme.spec | 9 +++++++-- specs/pki-console.spec | 8 ++++++-- specs/pki-core.spec | 8 ++++++-- specs/pki-migrate.spec | 10 ++++++++-- specs/pki-ra.spec | 12 +++++++++--- specs/pki-tps.spec | 12 +++++++++--- 7 files changed, 54 insertions(+), 16 deletions(-) (limited to 'specs') 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 10.0.0-0.2.a1 +- Modified CMake to use RPM version number + * Wed Feb 1 2012 Nathan Kinder 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 10.0.0-0.2.a1 +- Modified CMake to use RPM version number + * Wed Feb 1 2012 Nathan Kinder 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 10.0.0-0.8.a1 +- Modified CMake to use RPM version number + * Thu Aug 30 2012 Endi S. Dewata 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 10.0.0-0.36.a1 +- Modified CMake to use RPM version number + * Tue Sep 25 2012 Endi S. Dewata 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 10.0.0-0.2.a1 +- Modified CMake to use RPM version number + * Wed Feb 1 2012 Nathan Kinder 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 10.0.0-0.8.a1 +- Modified CMake to use RPM version number + * Mon Sep 24 2012 Endi S. Dewata 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 10.0.0-0.8.a1 +- Modified CMake to use RPM version number + * Mon Sep 24 2012 Endi S. Dewata 10.0.0-0.7.a1 - Merged pki-setup into pki-server -- cgit