rpms/bouncycastle-tsp/devel bouncycastle-tsp.spec,1.4,1.5
Orcan Ogetbil
oget at fedoraproject.org
Thu Sep 17 06:59:13 UTC 2009
Author: oget
Update of /cvs/pkgs/rpms/bouncycastle-tsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20249
Modified Files:
bouncycastle-tsp.spec
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
Index: bouncycastle-tsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-tsp/devel/bouncycastle-tsp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- bouncycastle-tsp.spec 26 Aug 2009 22:08:28 -0000 1.4
+++ bouncycastle-tsp.spec 17 Sep 2009 06:59:12 -0000 1.5
@@ -4,7 +4,7 @@
Summary: TSP libraries for Bouncy Castle
Name: bouncycastle-tsp
Version: 1.43
-Release: 5%{?dist}
+Release: 6%{?dist}
Group: System Environment/Libraries
License: MIT
URL: http://www.bouncycastle.org/
@@ -28,7 +28,6 @@ Requires: bouncycastle-mail = %{
BuildRequires: java-devel >= 1.7
Requires: java >= 1.7
BuildRequires: junit4
-Requires: junit4
Provides: bctsp = %{version}-%{release}
@@ -58,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
@@ -94,6 +94,15 @@ install -dm 755 $RPM_BUILD_ROOT%{_mavenp
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}
@@ -130,6 +139,15 @@ 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
More information about the fedora-extras-commits
mailing list