[pki-tps] Resolves Trac #349 - Create alpha2 builds

[Ade Lee]

commit 2e851018a34e4b813bb78d70fe744d802d022bca
Author: Ade Lee <alee at redhat.com>
Date:   Mon Oct 1 16:09:48 2012 -0400

    Resolves Trac #349 - Create alpha2 builds

 .gitignore   |    1 +
 pki-tps.spec |   23 +++++++++++++++++------
 sources      |    2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 642d6f0..f733a66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ pki-tps-1.3.2.tar.gz
 /pki-tps-9.0.6.tar.gz
 /pki-tps-9.0.7.tar.gz
 /pki-tps-10.0.0.a1.tar.gz
+/pki-tps-10.0.0.a2.tar.gz
diff --git a/pki-tps.spec b/pki-tps.spec
index 28035f2..a7e1b7f 100644
--- a/pki-tps.spec
+++ b/pki-tps.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-tps
 Version:          10.0.0
-Release:          %{?relprefix}6%{?prerel}%{?dist}
+Release:          %{?relprefix}8%{?prerel}%{?dist}
 Summary:          Certificate System - Token Processing System
 URL:              http://pki.fedoraproject.org/
 License:          LGPLv2
@@ -39,7 +39,6 @@ Requires:         mod_revocator
 Requires:         openldap-clients
 Requires:         perl-Mozilla-LDAP
 Requires:         pki-server >= 10.0.0
-Requires:         pki-setup
 Requires:         pki-tps-theme >= 10.0.0
 
 %if 0%{?fedora} >= 16
@@ -78,7 +77,7 @@ information about individual tokens.                                      \
 For deployment purposes, a TPS requires the following components from the \
 PKI Core package:                                                         \
                                                                           \
-  * pki-setup                                                             \
+  * pki-server                                                            \
   * pki-tools                                                             \
   * pki-selinux                                                           \
                                                                           \
@@ -135,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}
 
 
@@ -281,6 +283,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 5b7447b..0a31478 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2518b80b84e842bc37524632978f42f2  pki-tps-10.0.0.a1.tar.gz
+86a93a682c631be56bc166061b487c69  pki-tps-10.0.0.a2.tar.gz