rpms/bouncycastle/F-11 bcprov-jdk16-1.43.pom, NONE, 1.1 bouncycastle.spec, 1.17, 1.18

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25397

Modified Files:
	bouncycastle.spec 
Added Files:
	bcprov-jdk16-1.43.pom 
Log Message:
* Sun Sep  6 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.43-6
- Include improvements from #521475:
- Include missing properties files in jar.
- Build with javac -encoding UTF-8.
- Use %%javac and %%jar macros.
- Run test suite during build (ignoring failures for now).
- Follow upstream in excluding various test suite classes from jar; drop
  dependency on junit4.

* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 1.43-5
- Add maven POM



--- NEW FILE bcprov-jdk16-1.43.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.bouncycastle</groupId>
  <artifactId>bcprov-jdk16</artifactId>
  <packaging>jar</packaging>
  <name>Bouncy Castle Provider</name>
  <version>1.43</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>
  <url>http://www.bouncycastle.org/java.html</url>
  <licenses>
    <license>
      <name>Bouncy Castle Licence</name>
      <url>http://www.bouncycastle.org/licence.html</url>
      <distribution>repo</distribution>
    </license>
  </licenses>
  <scm>
    <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url>
  </scm>
</project>

Index: bouncycastle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle/F-11/bouncycastle.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- bouncycastle.spec	11 Jul 2009 17:47:01 -0000	1.17
+++ bouncycastle.spec	17 Sep 2009 07:13:28 -0000	1.18
@@ -5,7 +5,7 @@
 Summary:          Bouncy Castle Crypto Package for Java
 Name:             bouncycastle
 Version:          1.43
-Release:          3%{?dist}
+Release:          6%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.%{name}.org/
@@ -13,9 +13,12 @@ URL:              http://www.%{name}.org
 # is modified to
 # bcprov-%{archivever}-FEDORA.tar.gz with patented algorithms removed.
 Source0:          bcprov-%{archivever}-FEDORA.tar.gz
+Source1:          http://repo2.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.43/bcprov-jdk16-1.43.pom
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    jpackage-utils >= 1.5
 Requires:         jpackage-utils >= 1.5
+Requires(post):   jpackage-utils >= 1.7
+Requires(postun): jpackage-utils >= 1.7
 %if %{with_gcj}
 Requires:         java-1.5.0-gcj
 Requires(post):   java-gcj-compat
@@ -27,9 +30,8 @@ BuildArch:        noarch
 BuildRequires:    java-devel >= 1.7
 Requires:         java >= 1.7
 BuildRequires:    junit4
-Requires:         junit4
 
-Provides:         bcprov == %{version}-%{release}
+Provides:         bcprov = %{version}-%{release}
 
 %description
 The Bouncy Castle Crypto package is a Java implementation of cryptographic
@@ -59,13 +61,15 @@ unzip -qq src.zip -d src/
 %build
 pushd src
   export CLASSPATH=$(build-classpath junit4)
-  javac -g -target 1.5 `find . -type f -name "*.java"`
+  %javac -g -target 1.5 -encoding UTF-8 $(find . -type f -name "*.java")
   jarfile="../bcprov-%{version}.jar"
-  files="`find . -type f -name "*.class"`"
+  # Exclude all */test/* files except org.bouncycastle.util.test, cf. upstream
+  files="$(find . -type f \( -name '*.class' -o -name '*.properties' \) -not -path '*/test/*')"
+  files="$files $(find . -type f -path '*/org/bouncycastle/util/test/*.class')"
   test ! -d classes && mf="" \
     || mf="`find classes/ -type f -name "*.mf" 2>/dev/null`"
   test -n "$mf" && jar cvfm $jarfile $mf $files \
-    || jar cvf $jarfile $files
+    || %jar cvf $jarfile $files
 popd
 
 %install
@@ -93,6 +97,22 @@ popd
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 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-bcprov.pom
+%add_to_maven_depmap org.bouncycastle bcprov-jdk16 %{version} JPP bcprov
+
+%check
+pushd src
+  export CLASSPATH=$PWD:$(build-classpath junit4)
+  for test in $(find . -name AllTests.class) ; do
+    test=${test#./} ; test=${test%.class} ; test=${test//\//.}
+    # TODO: failures; get them fixed and remove || :
+    %java org.junit.runner.JUnitCore $test || :
+  done
+popd
+
+
 %post
 {
   # Rebuild the list of security providers in classpath.security
@@ -120,6 +140,7 @@ cp -pr docs/* $RPM_BUILD_ROOT%{_javadocd
     %{_bindir}/rebuild-gcj-db
   fi
 %endif
+%update_maven_depmap
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -152,6 +173,7 @@ if [ $1 -eq 0 ] ; then
   %endif
 
 fi
+%update_maven_depmap
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -166,12 +188,29 @@ rm -rf $RPM_BUILD_ROOT
   %{_libdir}/gcj/%{name}/
 %endif
 %{_sysconfdir}/java/security/security.d/2000-%{classname}
+%{_mavenpomdir}/JPP-bcprov.pom
+%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
 %defattr(-,root,root,-)
 %{_javadocdir}/%{name}/
 
 %changelog
+* Sun Sep  6 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.43-6
+- Include improvements from #521475:
+- Include missing properties files in jar.
+- Build with javac -encoding UTF-8.
+- Use %%javac and %%jar macros.
+- Run test suite during build (ignoring failures for now).
+- Follow upstream in excluding various test suite classes from jar; drop
+  dependency on junit4.
+
+* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 1.43-5
+- Add maven POM
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.43-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jul 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-3
 - Raise java requirement to >= 1.7 once again.