[pki-ra/f18] Resolves Trac #349 - Create alpha2 builds

Ade Lee vakwetu at fedoraproject.org
Mon Oct 1 19:57:03 UTC 2012


commit cb45c03a2ca664c320fa091214d2c3119b9d399b
Author: Ade Lee <alee at redhat.com>
Date:   Mon Oct 1 15:56:44 2012 -0400

    Resolves Trac #349 - Create alpha2 builds

 .gitignore  |    1 +
 pki-ra.spec |   23 +++++++++++++++++------
 sources     |    2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cbfb05d..c6ee653 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ pki-ra-1.3.1.tar.gz
 /pki-ra-9.0.3.tar.gz
 /pki-ra-9.0.4.tar.gz
 /pki-ra-10.0.0.a1.tar.gz
+/pki-ra-10.0.0.a2.tar.gz
diff --git a/pki-ra.spec b/pki-ra.spec
index e0e8186..98e0726 100644
--- a/pki-ra.spec
+++ b/pki-ra.spec
@@ -1,13 +1,13 @@
 # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release
 # also remove the space between % and global - this space is needed because
 # fedpkg verrel stupidly ignores comment lines
-%global prerel .a1
+%global prerel .a2
 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
 %global relprefix 0.
 
 Name:             pki-ra
 Version:          10.0.0
-Release:          %{?relprefix}6%{?prerel}%{?dist}
+Release:          %{?relprefix}8%{?prerel}%{?dist}
 Summary:          Certificate System - Registration Authority
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -31,7 +31,6 @@ Requires:         mod_perl >= 1.99_16
 Requires:         mod_revocator >= 1.0.3
 Requires:         pki-server >= 10.0.0
 Requires:         pki-ra-theme >= 10.0.0
-Requires:         pki-setup
 Requires:         perl-DBD-SQLite
 Requires:         sqlite
 Requires:         /usr/sbin/sendmail
@@ -65,7 +64,7 @@ organization's PKI deployment.
 For deployment purposes, an RA requires the following components from the PKI
 Core package:
 
-  * pki-setup
+  * pki-server
   * pki-tools
   * pki-selinux
 
@@ -112,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}
 
 
@@ -246,6 +248,15 @@ fi
 
 
 %changelog
+* Mon Oct 1 2012 Ade Lee <alee at redhat.com> 10.0.0-0.8.a2
+- Update release to a2
+
+* Sun Sep 30 2012 Endi S. Dewata <edewata at redhat.com> 10.0.0-0.8.a1
+- Modified CMake to use RPM version number
+
+* Mon Sep 24 2012 Endi S. Dewata <edewata at redhat.com> 10.0.0-0.7.a1
+- Merged pki-setup into pki-server
+
 * Tue Sep 11 2012 Matthew Harmsen <mharmsen at redhat.com> 10.0.0-0.6.a1
 - TRAC Ticket #312 - Dogtag 10: Automatically restart any running instances
   upon RPM "update" . . .
diff --git a/sources b/sources
index cb88fa3..c2d0302 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e691fd9e7fbb4af6f2055bf92ccb273e  pki-ra-10.0.0.a1.tar.gz
+223bece1414b4e26c93a0f2db2c0d1ff  pki-ra-10.0.0.a2.tar.gz


More information about the scm-commits mailing list