[pki-console] Resolves Dogtag Trac Ticket 282 - Create official f18 builds for dogtag 10

[Ade Lee]

commit adbbf84a2dafebd4cb0c8ff56934389cb754c072
Author: Ade Lee <alee at redhat.com>
Date:   Fri Sep 14 16:14:22 2012 -0400

    Resolves Dogtag Trac Ticket 282 - Create official f18 builds for dogtag 10

 .gitignore       |    1 +
 clog             |    2 -
 pki-console.spec |   62 ++++++++++++++++++++++++++++++++++++++++-------------
 sources          |    2 +-
 4 files changed, 49 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index af1725d..2729f1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ pki-console-1.3.2.tar.gz
 /pki-console-9.0.3.tar.gz
 /pki-console-9.0.4.tar.gz
 /pki-console-9.0.5.tar.gz
+/pki-console-10.0.0.a1.tar.gz
diff --git a/pki-console.spec b/pki-console.spec
index 89836e8..5821db1 100644
--- a/pki-console.spec
+++ b/pki-console.spec
@@ -1,6 +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
+# also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
+%global relprefix 0.
+
 Name:             pki-console
-Version:          9.0.5
-Release:          3%{?dist}
+Version:          10.0.0
+Release:          %{?relprefix}7%{?prerel}%{?dist}
 Summary:          Certificate System - PKI Console
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -16,29 +23,35 @@ BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    ldapjdk
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
+%if 0%{?fedora} >= 17
+BuildRequires:    junit
+%else
+BuildRequires:    junit4
+%endif
 %if 0%{?fedora} >= 16
 BuildRequires:    jpackage-utils >= 1.7.5-10
-BuildRequires:    jss >= 4.2.6-19.1
-BuildRequires:    pki-util >= 9.0.15
+BuildRequires:    jss >= 4.2.6-24
+BuildRequires:    pki-base >= 10.0.0
 %else
 BuildRequires:    jpackage-utils
-BuildRequires:    jss >= 4.2.6-17
-BuildRequires:    pki-util
+BuildRequires:    jss >= 4.2.6-24
+BuildRequires:    pki-base
 %endif
 
 Requires:         idm-console-framework
 Requires:         java >= 1:1.6.0
 Requires:         ldapjdk
+Requires:         pki-base >= 10.0.0
 Requires:         pki-console-theme >= 9.0.0
 %if 0%{?fedora} >= 16
 Requires:         jpackage-utils >= 1.7.5-10
-Requires:         jss >= 4.2.6-19.1
+Requires:         jss >= 4.2.6-24
 %else
 Requires:         jpackage-utils
-Requires:         jss >= 4.2.6-17
+Requires:         jss >= 4.2.6-24
 %endif
 
-Source0:          http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
+Source0:          http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz
 
 %description
 Certificate System (CS) is an enterprise software system designed
@@ -56,7 +69,7 @@ following "Mutually-Exclusive" PKI Theme packages:
 %prep
 
 
-%setup -q
+%setup -q -n %{name}-%{version}%{?prerel}
 
 
 %clean
@@ -66,7 +79,11 @@ following "Mutually-Exclusive" PKI Theme packages:
 %build
 %{__mkdir_p} build
 cd build
-%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_CONSOLE:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} ..
+%cmake -DVAR_INSTALL_DIR:PATH=/var \
+    -DBUILD_PKI_CONSOLE:BOOL=ON \
+    -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
+    %{?_without_javadoc:-DWITH_JAVADOC:BOOL=OFF} \
+    ..
 %{__make} VERBOSE=1 %{?_smp_mflags}
 
 
@@ -84,11 +101,26 @@ cd build
 
 
 %changelog
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.0.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+* Thu Aug 30 2012 Endi S. Dewata <edewata at redhat.com> 10.0.0-0.7.a1
+- Added runtime dependency on pki-base
+
+* Wed Aug 22 2012 Endi S. Dewata <edewata at redhat.com> 10.0.0-0.6.a1
+- Replaced pki-util with pki-base
+
+* Thu Jul 12 2012 Endi S. Dewata <edewata at redhat.com> 10.0.0-0.5.a1
+- Added option to build without Javadoc
+
+* Thu Apr  5 2012 Christina Fu <cfu at redhat.com> 10.0.0-0.4.a1
+- Bug 745278 - [RFE] ECC encryption keys cannot be archived
+
+* Wed Mar 14 2012 Matthew Harmsen <mharmsen at redhat.com> 10.0.0-0.3.a1
+- Corrected 'junit' dependency check
+
+* Wed Feb 22 2012 Matthew Harmsen <mharmsen at redhat.com> 10.0.0-0.2.a1
+- Bugzilla Bug #788787 - added 'junit'/'junit4' build-time requirements
 
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.0.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Wed Feb  1 2012 Nathan Kinder <nkinder at redhat.com> 10.0.0-0.1.a1
+- Updated package version number
 
 * Thu Sep 22 2011 Matthew Harmsen <mharmsen at redhat.com> 9.0.5-1
 - Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen)
diff --git a/sources b/sources
index fea1db1..70d489c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2b9336f0f5318167cd653bbcff93e8db  pki-console-9.0.5.tar.gz
+1afd8ef6c6896a6b43d23ddd98b85260  pki-console-10.0.0.a1.tar.gz