[bouncycastle-tsp] Update to version 1.50

[Michal Srb]

commit 36c041ce9c219c4943ea05e23765fe1f7abae50f
Author: Michal Srb <msrb at redhat.com>
Date:   Tue Feb 25 00:42:04 2014 +0100

    Update to version 1.50
    
    - Switch to java-headless (Resolves: rhbz#1067987)

 .gitignore            |    2 +
 bctsp-jdk16-1.46.pom  |   35 --------------------------------
 bouncycastle-tsp.spec |   53 +++++++++++++++++++++++++------------------------
 sources               |    3 +-
 4 files changed, 31 insertions(+), 62 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ddf85bd..16859d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 bctsp-jdk16-145.tar.gz
 /bctsp-jdk16-146.tar.gz
+/bcpkix-jdk15on-1.50.pom
+/bcpkix-jdk15on-150.tar.gz
diff --git a/bouncycastle-tsp.spec b/bouncycastle-tsp.spec
index 5b78c03..ee21874 100644
--- a/bouncycastle-tsp.spec
+++ b/bouncycastle-tsp.spec
@@ -1,28 +1,24 @@
-%global ver 1.46
-%global archivever  jdk16-%(echo %{ver}|sed 's|\\\.||')
+%global ver 1.50
+%global archivever  jdk15on-%(echo %{ver}|sed 's|\\\.||')
 
 Summary:          TSP libraries for Bouncy Castle
 Name:             bouncycastle-tsp
 Version:          %{ver}
-Release:          7%{?dist}
-Group:            System Environment/Libraries
+Release:          1%{?dist}
 License:          MIT
 URL:              http://www.bouncycastle.org/
-Source0:          http://www.bouncycastle.org/download/bctsp-%{archivever}.tar.gz
-Source1:          http://repo2.maven.org/maven2/org/bouncycastle/bctsp-jdk16/%{version}/bctsp-jdk16-%{version}.pom
-BuildRequires:    jpackage-utils >= 1.5
-Requires:         jpackage-utils >= 1.5
-Requires(post):   jpackage-utils >= 1.7
-Requires(postun): jpackage-utils >= 1.7
-BuildArch:        noarch
+Source0:          https://www.bouncycastle.org/download/bcpkix-%{archivever}.tar.gz
+Source1:          http://repo2.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/%{version}/bcpkix-jdk15on-%{version}.pom
+BuildRequires:    javapackages-tools
+Requires:         javapackages-tools
 BuildRequires:    bouncycastle-mail = %{version}
-BuildRequires:    bouncycastle-mail >= 1.46-4
 Requires:         bouncycastle-mail = %{version}
-Requires:         bouncycastle-mail >= 1.46-4
 BuildRequires:    java-devel >= 1.7
-Requires:         java >= 1.7
+Requires:         java-headless >= 1.7
 BuildRequires:    junit4
 
+BuildArch:        noarch
+
 Provides:         bctsp = %{version}-%{release}
 
 %description
@@ -33,22 +29,29 @@ generators/processors for Time Stamp Protocol (TSP), for Bouncy Castle.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Documentation
 BuildArch:      noarch
-Requires:       %{name} = %{version}-%{release}
-Requires:       jpackage-utils
 
 %description javadoc
 API documentation for the %{name} package.
 
 %prep
-%setup -q -n bctsp-%{archivever}
+%setup -q -n bcpkix-%{archivever}
+
+cp %{SOURCE1} pom.xml
+
 mkdir src
 unzip -qq src.zip -d src/
 # Remove provided binaries
 find . -type f -name "*.class" -exec rm -f {} \;
 find . -type f -name "*.jar" -exec rm -f {} \;
 
+# keep only tsp sources
+find ./src/org/bouncycastle/ -mindepth 1 -maxdepth 1 -not -name tsp -exec rm -Rf {} +
+
+# fix pom.xml (upstream doesn't provide pom for tsp anymore)
+sed -i 's|<artifactId>bcpkix-jdk15on</artifactId>|<artifactId>bctsp-jdk16</artifactId>|' pom.xml
+%pom_add_dep org.bouncycastle:bcmail-jdk15on
+
 %build
 pushd src
   export CLASSPATH=$(build-classpath bcprov bcmail junit4)
@@ -81,8 +84,8 @@ cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # maven pom
 install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-bctsp.pom
-%add_to_maven_depmap org.bouncycastle bctsp-jdk16 %{version} JPP bctsp
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-bctsp.pom
+%add_maven_depmap JPP-bctsp.pom bctsp.jar
 
 %check
 pushd src
@@ -94,12 +97,6 @@ pushd src
   done
 popd
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 
 %files
 %doc *.html
@@ -113,6 +110,10 @@ popd
 %{_javadocdir}/%{name}/
 
 %changelog
+* Tue Feb 25 2014 Michal Srb <msrb at redhat.com> - 1.50-1
+- Update to version 1.50
+- Switch to java-headless (Resolves: rhbz#1067987)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.46-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index c2a9a8c..38e2152 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-b69e2f9c77df884d5b004c0a3983c4a1  bctsp-jdk16-146.tar.gz
+8979c727e3be9c63c8edf46f2719af77  bcpkix-jdk15on-1.50.pom
+5b4bef277a8c477998829b367eb06364  bcpkix-jdk15on-150.tar.gz