- Depend on junit not junit4
OBS-URL: https://build.opensuse.org/package/show/Java:packages/bouncycastle?expand=0&rev=17
This commit is contained in:
parent
c027c4df92
commit
0529a25e58
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jul 7 14:57:54 UTC 2014 - tchvatal@suse.com
|
||||||
|
|
||||||
|
- Depend on junit not junit4
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu May 15 15:29:26 UTC 2014 - darin@darins.net
|
Thu May 15 15:29:26 UTC 2014 - darin@darins.net
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ BuildRequires: unzip
|
|||||||
#FIXME: this is needed for initialize of NSS crypto backend, will be required (not required(post) by openjdk)
|
#FIXME: this is needed for initialize of NSS crypto backend, will be required (not required(post) by openjdk)
|
||||||
BuildRequires: mozilla-nss
|
BuildRequires: mozilla-nss
|
||||||
Requires: java
|
Requires: java
|
||||||
BuildRequires: junit4
|
BuildRequires: junit
|
||||||
|
|
||||||
Provides: bcprov = %{version}-%{release}
|
Provides: bcprov = %{version}-%{release}
|
||||||
|
|
||||||
@ -77,8 +77,8 @@ unzip -qq src.zip -d src/
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
pushd src
|
pushd src
|
||||||
export CLASSPATH=$(build-classpath junit4)
|
export CLASSPATH=$(build-classpath junit)
|
||||||
%javac -g -source 1.6 -target 1.6 -encoding UTF-8 $(find . -type f -name "*.java")
|
%javac -g -source 1.5 -target 1.5 -encoding UTF-8 $(find . -type f -name "*.java")
|
||||||
jarfile="../bcprov-%{version}.jar"
|
jarfile="../bcprov-%{version}.jar"
|
||||||
# Exclude all */test/* files except org.bouncycastle.util.test, cf. upstream
|
# Exclude all */test/* files except org.bouncycastle.util.test, cf. upstream
|
||||||
files="$(find . -type f \( -name '*.class' -o -name '*.properties' \) -not -path '*/test/*')"
|
files="$(find . -type f \( -name '*.class' -o -name '*.properties' \) -not -path '*/test/*')"
|
||||||
@ -92,10 +92,6 @@ pushd src
|
|||||||
popd
|
popd
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%if 0%{?suse_version} == 1110
|
|
||||||
export NO_BRP_CHECK_BYTECODE_VERSION=true
|
|
||||||
%endif
|
|
||||||
|
|
||||||
install -dm 755 %{buildroot}%{_sysconfdir}/java/security/security.d
|
install -dm 755 %{buildroot}%{_sysconfdir}/java/security/security.d
|
||||||
touch %{buildroot}%{_sysconfdir}/java/security/security.d/2000-%{classname}
|
touch %{buildroot}%{_sysconfdir}/java/security/security.d/2000-%{classname}
|
||||||
|
|
||||||
@ -118,7 +114,7 @@ install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-bcprov.pom
|
|||||||
|
|
||||||
%check
|
%check
|
||||||
pushd src
|
pushd src
|
||||||
export CLASSPATH=$PWD:$(build-classpath junit4)
|
export CLASSPATH=$PWD:$(build-classpath junit)
|
||||||
for test in $(find . -name AllTests.class) ; do
|
for test in $(find . -name AllTests.class) ; do
|
||||||
test=${test#./} ; test=${test%.class} ; test=${test//\//.}
|
test=${test#./} ; test=${test%.class} ; test=${test//\//.}
|
||||||
# TODO: failures; get them fixed and remove || :
|
# TODO: failures; get them fixed and remove || :
|
||||||
|
Loading…
Reference in New Issue
Block a user