Hello community, here is the log from the commit of package tagsoup for openSUSE:Factory checked in at 2017-09-23 21:34:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tagsoup (Old) and /work/SRC/openSUSE:Factory/.tagsoup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tagsoup" Sat Sep 23 21:34:29 2017 rev:2 rq:528137 version:1.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/tagsoup/tagsoup.changes 2017-08-24 18:49:05.549354098 +0200 +++ /work/SRC/openSUSE:Factory/.tagsoup.new/tagsoup.changes 2017-09-23 21:34:40.446545844 +0200 @@ -1,0 +2,9 @@ +Thu Sep 21 19:46:20 UTC 2017 - [email protected] + +- Fix build with jdk9: specify source and target level 1.6 +- Added patch: + * tagsoup-1.2.1-jdk9.patch + + Don't specify java source and target levels on command-line + + Give path to the built classes to javadoc + +------------------------------------------------------------------- New: ---- tagsoup-1.2.1-jdk9.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tagsoup.spec ++++++ --- /var/tmp/diff_new_pack.ir2kMZ/_old 2017-09-23 21:34:41.106453039 +0200 +++ /var/tmp/diff_new_pack.ir2kMZ/_new 2017-09-23 21:34:41.114451914 +0200 @@ -28,14 +28,14 @@ Source0: tagsoup-1.2.1-src.zip Source1: http://repo1.maven.org/maven2/org/ccil/cowan/tagsoup/tagsoup/%{version}/tagsoup-%{version}.pom Patch0: tagsoup-1.2.1-man.patch +Patch1: tagsoup-1.2.1-jdk9.patch BuildRequires: ant -BuildRequires: bash -BuildRequires: java-1_7_0-openjdk-devel +BuildRequires: fdupes +BuildRequires: java-devel BuildRequires: jpackage-utils >= 1.6 BuildRequires: unzip BuildRequires: xalan-j2 Requires: jpackage-utils >= 1.6 -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -54,17 +54,19 @@ %prep %setup -q +%patch0 +%patch1 -p1 find . -name '*.class' -delete find . -name "*.jar" -delete -%patch0 %build - export CLASSPATH=$(build-classpath xalan-j2-serializer xalan-j2) ant \ + -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ -Dtagsoup.version=%{version} \ -Dj2se.apiurl=%{_javadocdir}/java \ + -Dclasspath=$(build-classpath xalan-j2-serializer xalan-j2) \ dist docs-api %install @@ -78,19 +80,18 @@ mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} mkdir -p %{buildroot}%{_mandir}/man1 install -m 644 %{name}.1 %{buildroot}%{_mandir}/man1/ %files -%defattr(-,root,root) %{_datadir}/java/tagsoup.jar %{_datadir}/maven-poms/JPP-tagsoup.pom %{_mandir}/man1/%{name}.1* %doc CHANGES LICENSE README TODO %{name}.txt %files javadoc -%defattr(-,root,root) %{_javadocdir}/%{name} %doc LICENSE ++++++ tagsoup-1.2.1-jdk9.patch ++++++ --- tagsoup-1.2.1/build.xml 2011-07-08 02:17:59.000000000 +0200 +++ tagsoup-1.2.1/build.xml 2017-09-21 21:44:37.145479041 +0200 @@ -79,7 +79,7 @@ <!-- compile java sources --> <target name="compile" depends="init,prepare,build-parser" description="Compile java classes."> - <javac source="1.4" target="1.4" srcdir="${src}/java" destdir="${build}" deprecation="on" verbose="off" debug="on"> + <javac srcdir="${src}/java" destdir="${build}" deprecation="on" verbose="off" debug="on"> <src path="${src}/java"/> <src path="${tmp}/src"/> </javac> @@ -149,7 +149,7 @@ description="Generate javadoc documentation."> <mkdir dir="${docs}/api"/> <javadoc packagenames="org.*" - sourcepath="${src}/java" destdir="${docs}/api" + sourcepath="${src}/java" classpath="${build}" destdir="${docs}/api" use="true" windowtitle="TagSoup ${tagsoup.version} API"> <doctitle><![CDATA[<h1>TagSoup Package Documentation</h1>]]></doctitle>
