Remove dependency on java-gcj-compat

OBS-URL: https://build.opensuse.org/package/show/Java:packages/dom2-core-tests?expand=0&rev=14
This commit is contained in:
Fridrich Strba 2017-09-15 07:48:16 +00:00 committed by Git OBS Bridge
parent 38a77cd5af
commit f65e692256
2 changed files with 18 additions and 14 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Sep 15 07:46:31 UTC 2017 - fstrba@suse.com
- Don't hardcode dependency on java-gcj-compat
* use java-devel >= 1.6 instead
- Specify java source and target levels 1.6 in order to allow
building with jdk9
-------------------------------------------------------------------
Thu Nov 14 12:22:56 UTC 2013 - mvyskocil@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package dom2-core-tests
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,24 +17,22 @@
%define section free
Name: dom2-core-tests
Version: 0.0.1
Release: 0
Summary: DOM Conformance Test Suite
License: W3C
Group: Development/Libraries/Java
Version: 0.0.1
Release: 0
Url: http://www.w3.org/DOM/Test/
BuildArch: noarch
Source0: http://www.w3.org/2004/04/dom2-core-tests-20040405.jar
Source1: LICENSE.html
Patch0: dom2-core-tests-build_xml.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ant
BuildRequires: java-1_5_0-gcj-compat-devel
BuildRequires: java-devel >= 1.6
BuildRequires: javapackages-tools
BuildRequires: junit
BuildRequires: unzip
BuildArch: noarch
%description
The DOM Test Suites (DOM TS) will consist of a number of tests for each
@ -45,9 +43,8 @@ grammar will be specified in XML Schema and DTD form. The grammar will
be automatically generated from the DOM specifications themselves, to
ensure stability and correctness.
%prep
%setup -q -c -n %{name}-%{version}
%setup -q -c
rm -rf junit
find . -name "*.class" -exec rm {} \;
%patch0 -b .orig
@ -57,19 +54,18 @@ rm -rf org/w3c/domts/JUnitRunner.java
%build
export CLASSPATH=$(build-classpath junit)
ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 dist
ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 dist
%install
# jars
install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
install -d -m 0755 %{buildroot}%{_javadir}
vjar=$(echo %{name}.jar | sed s+.jar+-%{version}.jar+g)
install -m 644 %{name}-%{version}/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/$vjar
pushd $RPM_BUILD_ROOT%{_javadir}
install -m 644 %{name}-%{version}/%{name}.jar %{buildroot}%{_javadir}/$vjar
pushd %{buildroot}%{_javadir}
ln -fs $vjar %{name}.jar
popd
%files
%defattr(0644,root,root,0755)
%doc LICENSE.html
%{_javadir}/*