This commit is contained in:
parent
47e55ab36a
commit
106046f7ba
19
dom4j-javadoc.patch
Normal file
19
dom4j-javadoc.patch
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
--- dom4j/build.xml 2009-05-12 15:04:18.000000000 +0200
|
||||||
|
+++ dom4j/build.xml 2018-07-10 10:51:51.814095475 +0200
|
||||||
|
@@ -224,7 +224,6 @@
|
||||||
|
doctitle="${Name}"
|
||||||
|
bottom="Copyright © ${year} MetaStuff Ltd. All Rights Reserved. Hosted by <p> <img src='http://sourceforge.net/sflogo.php?group_id=16035' width='88' height='31' border='0' alt='SourceForge Logo' />"
|
||||||
|
stylesheetfile="${doc.dir}/style/javadoc.css">
|
||||||
|
- <link href="file:///usr/share/doc/classpath-doc/api"/>
|
||||||
|
</javadoc>
|
||||||
|
|
||||||
|
<mkdir dir="${build.apidocs}"/>
|
||||||
|
@@ -240,8 +239,6 @@
|
||||||
|
doctitle="${Name}"
|
||||||
|
bottom="Copyright © ${year} MetaStuff Ltd. All Rights Reserved. Hosted by <p> <img src='http://sourceforge.net/sflogo.php?group_id=16035' width='88' height='31' border='0' alt='SourceForge Logo' />"
|
||||||
|
stylesheetfile="${doc.dir}/style/javadoc.css">
|
||||||
|
- <link href="file:///usr/share/doc/classpath-doc/api"/>
|
||||||
|
- <link href="${build.javadocs}"/>
|
||||||
|
</javadoc>
|
||||||
|
</target>
|
||||||
|
|
@ -1,3 +1,13 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jul 10 12:41:17 UTC 2018 - fstrba@suse.com
|
||||||
|
|
||||||
|
- Don't build classes depending on Java EE classes removed in
|
||||||
|
OpenJDK 11
|
||||||
|
- Added patch:
|
||||||
|
* dom4j-javadoc.patch
|
||||||
|
+ Don't load urls while building javadoc in environment without
|
||||||
|
connectivity
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed May 16 11:56:27 UTC 2018 - fstrba@suse.com
|
Wed May 16 11:56:27 UTC 2018 - fstrba@suse.com
|
||||||
|
|
||||||
|
@ -36,10 +36,12 @@ Source1: dom4j_rundemo.sh
|
|||||||
Source2: http://repo1.maven.org/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom
|
Source2: http://repo1.maven.org/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom
|
||||||
Patch0: dom4j-1.6.1-bug1618750.patch
|
Patch0: dom4j-1.6.1-bug1618750.patch
|
||||||
Patch1: dom4j-sourcetarget.patch
|
Patch1: dom4j-sourcetarget.patch
|
||||||
|
Patch2: dom4j-javadoc.patch
|
||||||
BuildRequires: ant >= 1.6.5
|
BuildRequires: ant >= 1.6.5
|
||||||
BuildRequires: ant-apache-resolver
|
BuildRequires: ant-apache-resolver
|
||||||
BuildRequires: ant-junit
|
BuildRequires: ant-junit
|
||||||
BuildRequires: bea-stax
|
BuildRequires: bea-stax
|
||||||
|
BuildRequires: fdupes
|
||||||
BuildRequires: isorelax
|
BuildRequires: isorelax
|
||||||
BuildRequires: java-devel >= 1.6
|
BuildRequires: java-devel >= 1.6
|
||||||
# Needed for maven conversions
|
# Needed for maven conversions
|
||||||
@ -125,8 +127,10 @@ sed -i -e '/unjar/d' -e 's|,cookbook/\*\*,|,|' build.xml
|
|||||||
rm -f src/test/org/dom4j/ThreadingTest.java
|
rm -f src/test/org/dom4j/ThreadingTest.java
|
||||||
# FIXME: (yyang): failed in JDK6, maybe failed to load russArticle.xml because it's russian encoding
|
# FIXME: (yyang): failed in JDK6, maybe failed to load russArticle.xml because it's russian encoding
|
||||||
rm -f src/test/org/dom4j/io/StaxTest.java
|
rm -f src/test/org/dom4j/io/StaxTest.java
|
||||||
|
rm -rf src/java/org/dom4j/jaxb
|
||||||
%patch0 -p1 -b .bug1618750
|
%patch0 -p1 -b .bug1618750
|
||||||
%patch1 -p1 -b .sourcetarget
|
%patch1 -p1 -b .sourcetarget
|
||||||
|
%patch2 -p1 -b .javadoc
|
||||||
perl -pi -e 's/\r//g' LICENSE.txt docs/clover/*.css docs/style/*.css docs/xref/*.css docs/xref-test/*.css src/doc/style/*.css docs/benchmarks/xpath/*.java
|
perl -pi -e 's/\r//g' LICENSE.txt docs/clover/*.css docs/style/*.css docs/xref/*.css docs/xref-test/*.css src/doc/style/*.css docs/benchmarks/xpath/*.java
|
||||||
|
|
||||||
pushd lib
|
pushd lib
|
||||||
@ -186,6 +190,9 @@ mkdir -p %{buildroot}%{_datadir}/%{name}/src
|
|||||||
cp -pr src/samples %{buildroot}%{_datadir}/%{name}/src
|
cp -pr src/samples %{buildroot}%{_datadir}/%{name}/src
|
||||||
#cp -pr build/classes/org/dom4j/samples $RPM_BUILD_ROOT%{_datadir}/%{name}/classes/org/dom4j
|
#cp -pr build/classes/org/dom4j/samples $RPM_BUILD_ROOT%{_datadir}/%{name}/classes/org/dom4j
|
||||||
install -m 0755 run.sh %{buildroot}%{_datadir}/%{name}
|
install -m 0755 run.sh %{buildroot}%{_datadir}/%{name}
|
||||||
|
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
|
||||||
|
%fdupes -s %{buildroot}%{_docdir}/%{name}-%{version}
|
||||||
|
%fdupes -s %{buildroot}%{_datadir}/%{name}
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(0644,root,root,0755)
|
%defattr(0644,root,root,0755)
|
||||||
|
Loading…
Reference in New Issue
Block a user