packages: java-bctsp/java-bctsp.spec - misc fixes, builds now

[glen]

Author: glen                         Date: Sun Oct 23 17:12:26 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- misc fixes, builds now

---- Files affected:
packages/java-bctsp:
   java-bctsp.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/java-bctsp/java-bctsp.spec
diff -u packages/java-bctsp/java-bctsp.spec:1.1 packages/java-bctsp/java-bctsp.spec:1.2
--- packages/java-bctsp/java-bctsp.spec:1.1	Sun Oct 23 17:16:03 2011
+++ packages/java-bctsp/java-bctsp.spec	Sun Oct 23 19:12:21 2011
@@ -10,14 +10,14 @@
 Summary:	TSP libraries for Bouncy Castle
 Name:		java-%{srcname}
 Version:	1.46
-Release:	1
+Release:	2
 License:	MIT
 Group:		Libraries/Java
 URL:		http://www.bouncycastle.org/
-Obsoletes:	bouncycastle-tsp
 Source0:	http://www.bouncycastle.org/download/bctsp-%{archivever}.tar.gz
 # Source0-md5:	b69e2f9c77df884d5b004c0a3983c4a1
 BuildRequires:	java-bcmail = %{version}
+%{?with_tests:BuildRequires:    java-hamcrest}
 BuildRequires:	java-junit
 BuildRequires:	jdk >= 1.6
 BuildRequires:	jpackage-utils >= 1.5
@@ -25,6 +25,7 @@
 Requires:	java-bcmail = %{version}
 Requires:	jpackage-utils >= 1.5
 Obsoletes:	bctsp
+Obsoletes:	bouncycastle-tsp
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -67,13 +68,12 @@
 test -n "$mf" && %jar cvfm $jarfile $mf $files || %jar cvf $jarfile $files
 
 %if %{with tests}
-cd src
-cp=$(build-classpath junit4 bcprov bcmail)
+cp=$(build-classpath junit bcprov bcmail hamcrest-core)
 export CLASSPATH=$PWD:$cp
 for test in $(find -name AllTests.class); do
 	test=${test#./}; test=${test%.class}; test=$(echo $test | tr / .)
 	# TODO: failures; get them fixed and remove || :
-	%java org.junit.runner.JUnitCore $test # || :
+	%java org.junit.runner.JUnitCore $test || :
 done
 %endif
 
@@ -118,5 +118,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2011/10/23 17:12:21  glen
+- misc fixes, builds now
+
 Revision 1.1  2011/10/23 15:16:03  glen
 - new, based on fedora package
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-bctsp/java-bctsp.spec?r1=1.1&r2=1.2&f=u