rpms/bouncycastle-tsp/F-11 bctsp-jdk16-1.43.pom, NONE, 1.1 bouncycastle-tsp.spec, 1.2, 1.3
Orcan Ogetbil
oget at fedoraproject.org
Thu Sep 17 07:23:54 UTC 2009
Author: oget
Update of /cvs/pkgs/rpms/bouncycastle-tsp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30331
Modified Files:
bouncycastle-tsp.spec
Added Files:
bctsp-jdk16-1.43.pom
Log Message:
* Thu Sep 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-6
- Similar fixes proposed in RHBZ#521475, namely:
- Include missing properties files in jar.
- Build with javac -encoding UTF-8.
- Use %%javac and %%jar macros.
- Run test suite during build.
- Follow upstream in excluding various test suite classes from jar.
- Remove R: junit4
* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 1.43-5
- Add maven POM
--- NEW FILE bctsp-jdk16-1.43.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.bouncycastle</groupId>
<artifactId>bctsp-jdk16</artifactId>
<packaging>jar</packaging>
<name>Bouncy Castle OpenPGP API</name>
<version>1.43</version>
<description>The Bouncy Castle Java API for handling the Time Stamp Protocol (TSP). This jar contains the TSP API for JDK 1.6. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs.</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>
<dependencies>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
<version>1.43</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk16</artifactId>
<version>1.43</version>
<type>jar</type>
</dependency>
</dependencies>
</project>
Index: bouncycastle-tsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-tsp/F-11/bouncycastle-tsp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bouncycastle-tsp.spec 15 Jul 2009 01:25:55 -0000 1.2
+++ bouncycastle-tsp.spec 17 Sep 2009 07:23:52 -0000 1.3
@@ -4,14 +4,17 @@
Summary: TSP libraries for Bouncy Castle
Name: bouncycastle-tsp
Version: 1.43
-Release: 3%{?dist}
+Release: 6%{?dist}
Group: System Environment/Libraries
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/1.43/bctsp-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
@@ -25,7 +28,6 @@ Requires: bouncycastle-mail = %{
BuildRequires: java-devel >= 1.7
Requires: java >= 1.7
BuildRequires: junit4
-Requires: junit4
Provides: bctsp = %{version}-%{release}
@@ -55,13 +57,14 @@ find . -type f -name "*.jar" -exec rm -f
%build
pushd src
export CLASSPATH=$(build-classpath bcprov bcmail junit4)
- javac -target 1.5 `find . -type f -name "*.java"`
+ %javac -g -target 1.5 -encoding UTF-8 $(find . -type f -name "*.java")
jarfile="../bctsp-%{version}.jar"
- files="`find . -type f -name "*.class"`"
+ # Exclude all */test/* , cf. upstream
+ files="$(find . -type f \( -name '*.class' -o -name '*.properties' \) -not -path '*/test/*')"
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
+ test -n "$mf" && %jar cvfm $jarfile $mf $files \
+ || %jar cvf $jarfile $files
popd
%install
@@ -86,15 +89,31 @@ popd
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%if %{with_gcj}
+# 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
+
+%check
+pushd src
+ export CLASSPATH=$PWD:$(build-classpath junit4 bcprov bcmail)
+ for test in $(find . -name AllTests.class) ; do
+ test=${test#./} ; test=${test%.class} ; test=${test//\//.}
+ %java org.junit.runner.JUnitCore $test
+ done
+popd
+
%post
+%update_maven_depmap
+%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]; then
%{_bindir}/rebuild-gcj-db
fi
%endif
-%if %{with_gcj}
%postun
+%update_maven_depmap
+%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]; then
%{_bindir}/rebuild-gcj-db
fi
@@ -109,6 +128,8 @@ rm -rf $RPM_BUILD_ROOT
%{_javadir}/bctsp.jar
%{_javadir}/bctsp-%{version}.jar
%{_javadir}/gcj-endorsed/bctsp-%{version}.jar
+%{_mavenpomdir}/JPP-bctsp.pom
+%{_mavendepmapfragdir}/%{name}
%if %{with_gcj}
%{_libdir}/gcj/%{name}/
%endif
@@ -118,6 +139,21 @@ rm -rf $RPM_BUILD_ROOT
%{_javadocdir}/%{name}/
%changelog
+* Thu Sep 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-6
+- Similar fixes proposed in RHBZ#521475, namely:
+- Include missing properties files in jar.
+- Build with javac -encoding UTF-8.
+- Use %%javac and %%jar macros.
+- Run test suite during build.
+- Follow upstream in excluding various test suite classes from jar.
+- Remove R: 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
+
* Tue Jul 13 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-3
- Re-enable AOT bits thanks to Andrew Haley.
More information about the fedora-extras-commits
mailing list