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/pki-ra.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'specs/pki-ra.spec') 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 -- cgit