Fridrich Strba 2017-09-14 14:40:35 +00:00 committed by Git OBS Bridge
parent 264622bc6d
commit 7cfcad0982
2 changed files with 16 additions and 13 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Sep 14 14:39:55 UTC 2017 - fstrba@suse.com
- Build with javac whose syntax is compatible with OpenJDK
-------------------------------------------------------------------
Fri May 19 16:55:11 UTC 2017 - tchvatal@suse.com

View File

@ -59,15 +59,19 @@ BuildRequires: ant-junit
BuildRequires: java-1_5_0-gcj-compat-devel
BuildRequires: junit
BuildRequires: servletapi5
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel
#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel
#!BuildIgnore: java-9-openjdk java-9-openjdk-devel
BuildRequires: unzip
BuildRequires: xalan-j2
BuildRequires: xerces-j2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!BuildIgnore: java-1_6_0-openjdk
#!BuildIgnore: java-1_6_0-openjdk-devel
#!BuildIgnore: java-1_7_0-openjdk
#!BuildIgnore: java-1_7_0-openjdk-devel
#!BuildIgnore: java-1_8_0-openjdk
#!BuildIgnore: java-1_8_0-openjdk-devel
#!BuildIgnore: java-9-openjdk
#!BuildIgnore: java-9-openjdk-devel
BuildArch: noarch
BuildConflicts: java-devel >= 1.9
%description
JDOM is, quite simply, a Java representation of an XML document. JDOM
@ -158,11 +162,9 @@ find . -name "*.jar" -delete -name "*.class" -delete
%patch2
%build
LIBGCJ=$(ls %{_datadir}/java/libgcj* | tail -n1 )
LIBGCJ=$(basename $LIBGCJ)
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVA_OPTS="-C -ftarget=1.5"
export JAVA_OPTS="-source 1.5 -target 1.5 -J-Xss4m"
export JAVAC="javac ${JAVA_OPTS} "
export ANT_OPTS="-Xss4m"
i=0
export CLASSPATH="%{stage1_build_dir}:$(build-classpath $LIBGCJ xerces-j2 xalan-j2 xalan-j2-serializer junit servletapi5):%{jaxen_dir}/src/java/main/:%{jdom_dir}/src/java/:%{saxpath_dir}/src/java/main/:%{xom_dir}/src/:%{dom4j_dir}/src/java"
SOURCE_DIRS="%{jaxen_dir}/src/java/main/ %{jdom_dir}/src/java/ %{saxpath_dir}/src/java/main/ %{xom_dir}/src/ %{dom4j_dir}/src/java"
@ -224,19 +226,15 @@ ln -sf %{_javadir}/saxpath-%{saxpath_version}.jar %{buildroot}/%{_javadir}/saxpa
ln -sf %{_javadir}/xom-%{xom_version}.jar %{buildroot}/%{_javadir}/xom.jar
%files
%defattr(-,root,root)
%{_javadir}/jdom*.jar
%files -n xom
%defattr(-,root,root)
%{_javadir}/xom*.jar
%files -n saxpath
%defattr(-,root,root)
%{_javadir}/saxpath*.jar
%files -n jaxen
%defattr(-,root,root)
%{_javadir}/jaxen*.jar
%changelog