Accepting request 285095 from Java:packages

- Version bump to 1.50 to match Fedora
- Cleanup with spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/285095
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bouncycastle?expand=0&rev=11

bcprov-jdk15on-1.50.pom

@@ -2,11 +2,11 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.bouncycastle</groupId>
-  <artifactId>bcprov-jdk16</artifactId>
+  <artifactId>bcprov-jdk15on</artifactId>
   <packaging>jar</packaging>
   <name>Bouncy Castle Provider</name>
-  <version>1.45</version>
+  <version>1.50</version>
-  <description>The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. This jar contains JCE provider and lightweight API for the Bouncy Castle Cryptography APIs for JDK 1.6.</description>
+  <description>The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. This jar contains JCE provider and lightweight API for the Bouncy Castle Cryptography APIs for JDK 1.5 to JDK 1.7.</description>
   <url>http://www.bouncycastle.org/java.html</url>
   <licenses>
     <license>
@@ -16,6 +16,17 @@
     </license>
   </licenses>
   <scm>
-    <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url>
+    <url>https://github.com/bcgit/bc-java</url>
   </scm>
-</project>
+  <issueManagement>
+     <system>GitHub</system>
+     <url>https://github.com/bcgit/bc-java/issues?state=open</url>
+  </issueManagement>
+  <developers>
+    <developer>
+      <id>feedback-crypto</id>
+      <name>The Legion of the Bouncy Castle Inc.</name>
+      <email>feedback-crypto@bouncycastle.org</email>
+    </developer>
+  </developers>
+</project>

bcprov-jdk15on-150.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:468259c9166fbcf87ad284ae46fae45408cb7cfc9c406862ea75d5b8696f4f2a
+size 4629743

bcprov-jdk16-146-FEDORA.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:edb2665c3aff88aceef98f4a4b8b1cd95a2ef2796170641fd8343e4aa050dfc2
-size 3634603

bouncycastle.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb 10 12:29:43 UTC 2015 - tchvatal@suse.com
+
+- Version bump to 1.50 to match Fedora
+- Cleanup with spec-cleaner
+
 -------------------------------------------------------------------
 Mon Jul  7 14:57:54 UTC 2014 - tchvatal@suse.com
 

bouncycastle.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package bouncycastle
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,38 +16,31 @@
 #
 
 
-#
+%define ver  1.50
-%define ver  1.46
+%define shortver 150
-%define archivever  jdk16-%(echo %{ver}|sed 's|\\\.||')
+%define archivever jdk15on-%{shortver}
-%define classname   org.bouncycastle.jce.provider.BouncyCastleProvider
+%define classname org.bouncycastle.jce.provider.BouncyCastleProvider
-
-Summary:        Bouncy Castle Crypto Package for Java
-License:        MIT
-Group:          Development/Libraries/Java
 Name:           bouncycastle
 Version:        %{ver}
 Release:        0
-Url:            http://www.%{name}.org/
+Summary:        Bouncy Castle Crypto Package for Java
-# Original source http://www.bouncycastle.org/download/bcprov-%{archivever}.tar.gz
+License:        MIT
-# is modified to
+Group:          Development/Libraries/Java
-# bcprov-%{archivever}-FEDORA.tar.gz with patented algorithms removed.
+Url:            http://www.bouncycastle.org/
-# Specifically: IDEA algorithms got removed.
+Source0:        http://www.bouncycastle.org/download/bcprov-%{archivever}.tar.gz
-Source0:        bcprov-%{archivever}-FEDORA.tar.gz
+Source1:        http://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/%{ver}/bcprov-jdk15on-%{ver}.pom
-#Source1:        http://repo2.maven.org/maven2/org/bouncycastle/bcprov-jdk16/%{version}/bcprov-jdk16-%{version}.pom
-Source1:        bcprov-jdk16-%{version}.pom
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  javapackages-tools
-Requires(post):   javapackages-tools
-Requires(postun): javapackages-tools
-BuildArch:      noarch
 BuildRequires:  java-devel
-BuildRequires:  unzip
+BuildRequires:  javapackages-tools
+BuildRequires:  junit
 #FIXME: this is needed for initialize of NSS crypto backend, will be required (not required(post) by openjdk)
 BuildRequires:  mozilla-nss
+BuildRequires:  unzip
 Requires:       java
-BuildRequires:  junit
+Requires(post): javapackages-tools
-
+Requires(postun): javapackages-tools
 Provides:       bcprov = %{version}-%{release}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 The Bouncy Castle Crypto package is a Java implementation of cryptographic
@@ -58,9 +51,8 @@ the additional infrastructure to conform the algorithms to the JCE framework.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Libraries/Java
-BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
-Requires:       javapackages-tools
+BuildArch:      noarch
 
 %description javadoc
 API documentation for the %{name} package.
@@ -110,7 +102,7 @@ cp -pr docs/* %{buildroot}%{_javadocdir}/%{name}
 # maven pom
 install -dm 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-bcprov.pom
-%add_maven_depmap JPP-bcprov.pom bcprov.jar
+%add_maven_depmap -a "bouncycastle:bcprov-jdk15,org.bouncycastle:bcprov-jdk16" JPP-bcprov.pom bcprov.jar
 
 %check
 pushd src
@@ -126,7 +118,7 @@ popd
 {
   # Rebuild the list of security providers in classpath.security
   suffix=security/classpath.security
-  secfiles="/usr/lib/$suffix /usr/lib64/$suffix"
+  secfiles="%{_libexecdir}/$suffix %{_libdir}/$suffix"
 
   for secfile in $secfiles
   do
@@ -136,7 +128,7 @@ popd
     sed -i '/^security\.provider\./d' "$secfile"
 
     count=0
-    for provider in $(ls /etc/java/security/security.d)
+    for provider in $(ls %{_sysconfdir}/java/security/security.d)
     do
       count=$((count + 1))
       echo "security.provider.${count}=${provider#*-}" >> "$secfile"
@@ -150,7 +142,7 @@ if [ $1 -eq 0 ] ; then
   {
     # Rebuild the list of security providers in classpath.security
     suffix=security/classpath.security
-    secfiles="/usr/lib/$suffix /usr/lib64/$suffix"
+    secfiles="%{_libexecdir}/$suffix %{_libdir}/$suffix"
 
     for secfile in $secfiles
     do
@@ -160,7 +152,7 @@ if [ $1 -eq 0 ] ; then
       sed -i '/^security\.provider\./d' "$secfile"
 
       count=0
-      for provider in $(ls /etc/java/security/security.d)
+      for provider in $(ls %{_sysconfdir}/java/security/security.d)
       do
         count=$((count + 1))
         echo "security.provider.${count}=${provider#*-}" >> "$secfile"