pool/saxon6
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 527099 from Java:packages

Browse Source 
Fix build with jdk9

OBS-URL: https://build.opensuse.org/request/show/527099
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/saxon6?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger 2017-09-20 15:09:34 +00:00 committed by Git OBS Bridge
commit 8b5ba4193b
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
saxon6.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Sep 18 17:51:41 UTC 2017 - fstrba@suse.com
- Specify java source and target 1.6 to fix build with jdk9
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 19 17:10:09 UTC 2017 - tchvatal@suse.com Fri May 19 17:10:09 UTC 2017 - tchvatal@suse.com

12
saxon6.spec
View File

@ -40,6 +40,7 @@ Patch4: saxon-add-fixes-from-com-isl-saxon-aelfred.patch
#PATCH-FIX-OPENSUSE: implements batch mode in which saxon is capable to proceed more files per one JVM launch #PATCH-FIX-OPENSUSE: implements batch mode in which saxon is capable to proceed more files per one JVM launch
Patch5: saxon6-batch.patch Patch5: saxon6-batch.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: fdupes
BuildRequires: fop >= 0.20.1 BuildRequires: fop >= 0.20.1
BuildRequires: java-devel BuildRequires: java-devel
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
@ -50,7 +51,6 @@ Requires: %{_sbindir}/update-alternatives
Requires: jaxp_parser_impl Requires: jaxp_parser_impl
Provides: jaxp_transform_impl = %{name}-%{version} Provides: jaxp_transform_impl = %{name}-%{version}
Provides: saxon Provides: saxon
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
%description %description
@ -157,7 +157,7 @@ rm -rf *.jar docs/api
export LC_ALL=en_US.ISO-8859-2 export LC_ALL=en_US.ISO-8859-2
export CLASSPATH=%(build-classpath xml-commons-apis xmlgraphics-fop jdom) export CLASSPATH=%(build-classpath xml-commons-apis xmlgraphics-fop jdom)
ant \ ant \
-Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
-Dj2se.javadoc=%{_javadocdir}/java \ -Dj2se.javadoc=%{_javadocdir}/java \
-Dfop.javadoc=%{_javadocdir}/fop \ -Dfop.javadoc=%{_javadocdir}/fop \
-Djdom.javadoc=%{_javadocdir}/jdom -Djdom.javadoc=%{_javadocdir}/jdom
@ -173,6 +173,7 @@ cp -p build/lib/saxon-jdom.jar %{buildroot}%{_javadir}/%{name}-jdom.jar
# javadoc # javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name} mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -pr build/api/* %{buildroot}%{_javadocdir}/%{name} cp -pr build/api/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
# demo # demo
mkdir -p %{buildroot}%{_datadir}/%{name} mkdir -p %{buildroot}%{_datadir}/%{name}
@ -203,34 +204,27 @@ if [ $1 -eq 0 ] ; then
fi fi
%files %files
%defattr(0644,root,root,0755)
%{_javadir}/%{name}.jar %{_javadir}/%{name}.jar
%{_javadir}/%{name}.jar %{_javadir}/%{name}.jar
%{_javadir}/jaxp_transform_impl.jar %{_javadir}/jaxp_transform_impl.jar
%ghost %{_sysconfdir}/alternatives/jaxp_transform_impl.jar %ghost %{_sysconfdir}/alternatives/jaxp_transform_impl.jar
%files aelfred %files aelfred
%defattr(0644,root,root,0755)
%{_javadir}/%{name}-aelfred* %{_javadir}/%{name}-aelfred*
%files fop %files fop
%defattr(0644,root,root,0755)
%{_javadir}/%{name}-fop* %{_javadir}/%{name}-fop*
%files jdom %files jdom
%defattr(0644,root,root,0755)
%{_javadir}/%{name}-jdom* %{_javadir}/%{name}-jdom*
%files manual %files manual
%defattr(0644,root,root,0755)
%doc doc/*.html %doc doc/*.html
%files javadoc %files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name} %doc %{_javadocdir}/%{name}
%files demo %files demo
%defattr(0644,root,root,0755)
%{_datadir}/%{name} %{_datadir}/%{name}
%files scripts %files scripts