[pki-tps] Resolves rhbz #1037248,1037249

[mharmsen]

commit b78e689c1969ea04d22da7bc9780e5ee9da705e5
Author: Matthew Harmsen <mharmsen at redhat.com>
Date:   Thu Dec 19 14:05:05 2013 -0800

    Resolves rhbz #1037248,1037249
    
    Bugzilla Bug #1037248 - pki-core FTBFS if "-Werror=format-security" flag is used
    Bugzilla Bug #1037249 - pki-tps FTBFS if "-Werror=format-security" flag is used

 .gitignore   |    1 +
 pki-tps.spec |   19 +++++++++++++------
 sources      |    2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 71f9afb..8c7161a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ pki-tps-1.3.2.tar.gz
 /pki-tps-10.0.4.tar.gz
 /pki-tps-10.0.5.tar.gz
 /pki-tps-10.1.0.tar.gz
+/pki-tps-10.2.0.tar.gz
diff --git a/pki-tps.spec b/pki-tps.spec
index 2ade49c..a788394 100644
--- a/pki-tps.spec
+++ b/pki-tps.spec
@@ -1,11 +1,13 @@
 Name:             pki-tps
-Version:          10.1.0
-Release:          1%{?dist}
+Version:          10.2.0
+Release:          0.1%{?dist}
 Summary:          Certificate System - Token Processing System
 URL:              http://pki.fedoraproject.org/
 License:          LGPLv2
 Group:            System Environment/Daemons
 
+%bcond_without    javadoc
+
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    cmake >= 2.8.9-1
@@ -18,7 +20,7 @@ BuildRequires:    openldap-devel
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel >= 3.14.3
 BuildRequires:    pcre-devel
-BuildRequires:    pki-server >= 10.1.0
+BuildRequires:    pki-server >= 10.2.0
 BuildRequires:    python
 BuildRequires:    systemd
 BuildRequires:    svrcore-devel
@@ -33,8 +35,8 @@ Requires:         nss >= 3.14.3
 Requires:         nss-tools >= 3.14.3
 Requires:         openldap-clients
 Requires:         perl-Mozilla-LDAP
-Requires:         pki-server >= 10.1.0
-Requires:         pki-symkey >= 10.1.0
+Requires:         pki-server >= 10.2.0
+Requires:         pki-symkey >= 10.2.0
 
 Requires(post):   systemd-units
 Requires(preun):  systemd-units
@@ -128,7 +130,9 @@ cd build
 %else
 	-DRESTEASY_LIB=/usr/share/java/resteasy \
 %endif
-	%{?_without_javadoc:-DWITH_JAVADOC:BOOL=OFF} \
+%if ! %{with javadoc}
+	-DWITH_JAVADOC:BOOL=OFF \
+%endif
 	..
 %{__make} VERBOSE=1 %{?_smp_mflags}
 
@@ -239,6 +243,9 @@ fi
 
 
 %changelog
+* 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
 - Update release number for release build
 
diff --git a/sources b/sources
index 8383dc8..6ff5a2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d8bd835176ec78962c57518a0e45787e  pki-tps-10.1.0.tar.gz
+735be59cd088424f50bd60289551cf33  pki-tps-10.2.0.tar.gz