[pki-console] Resolves Bugzilla Bug #1138883 - Rebase Dogtag 10.1 to Dogtag 10.2

[mharmsen]

commit 2a9dccabdeda01295ef96888cdaff7521e0838ed
Author: Matthew Harmsen <mharmsen at redhat.com>
Date:   Fri Sep 5 20:06:32 2014 -0700

    Resolves Bugzilla Bug #1138883 - Rebase Dogtag 10.1 to Dogtag 10.2

 .gitignore       |    1 +
 pki-console.spec |   20 +++++++++++++++++---
 sources          |    2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4913e0a..3ede093 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ pki-console-1.3.2.tar.gz
 /pki-console-10.0.4.tar.gz
 /pki-console-10.0.5.tar.gz
 /pki-console-10.1.0.tar.gz
+/pki-console-10.2.0.tar.gz
diff --git a/pki-console.spec b/pki-console.spec
index bfb26ff..0d3d5b6 100644
--- a/pki-console.spec
+++ b/pki-console.spec
@@ -1,11 +1,13 @@
 Name:             pki-console
-Version:          10.1.0
-Release:          2%{?dist}
+Version:          10.2.0
+Release:          1%{?dist}
 Summary:          Certificate System - PKI Console
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
 Group:            System Environment/Base
 
+%bcond_without    javadoc
+
 BuildArch:        noarch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,6 +33,10 @@ Requires:         jss >= 4.2.6-24
 
 Source0:          http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz
 
+%if 0%{?rhel}
+ExcludeArch:      ppc ppc64 ppcle ppc64le s390 s390x
+%endif
+
 %description
 Certificate System (CS) is an enterprise software system designed
 to manage enterprise Public Key Infrastructure (PKI) deployments.
@@ -61,7 +67,9 @@ cd build
 	-DVAR_INSTALL_DIR:PATH=/var \
     -DBUILD_PKI_CONSOLE:BOOL=ON \
     -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
-    %{?_without_javadoc:-DWITH_JAVADOC:BOOL=OFF} \
+%if ! %{with javadoc}
+    -DWITH_JAVADOC:BOOL=OFF \
+%endif
     ..
 %{__make} VERBOSE=1 %{?_smp_mflags}
 
@@ -80,9 +88,15 @@ cd build
 
 
 %changelog
+* Wed Sep  3 2014 Dogtag Team <pki-devel at redhat.com> 10.2.0-1
+- Update release number for release build
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
+* Fri Nov 22 2013 Dogtag Team <pki-devel at redhat.com> 10.2.0-0.1
+- Updated version number to 10.2.0-0.1.
+
 * Fri Nov 15 2013 Ade Lee <alee at redhat.com> 10.1.0-1
 - Trac Ticket 788 - Clean up spec files
 - Update release number for release build
diff --git a/sources b/sources
index 2c11707..9b901c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9595e0a92d264d76695fec6587048289  pki-console-10.1.0.tar.gz
+ae3e47b079a98673522a652a022421ad  pki-console-10.2.0.tar.gz