Hello community, here is the log from the commit of package jedit for openSUSE:Factory checked in at 2017-09-20 17:10:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jedit (Old) and /work/SRC/openSUSE:Factory/.jedit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jedit" Wed Sep 20 17:10:06 2017 rev:27 rq:527187 version:5.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/jedit/jedit.changes 2014-07-10 14:55:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jedit.new/jedit.changes 2017-09-20 17:10:07.827181664 +0200 @@ -1,0 +2,7 @@ +Mon Sep 18 22:53:29 UTC 2017 - [email protected] + +- Added patch: + * jedit-encoding.patch + + fix javadoc generation with jdk9 + +------------------------------------------------------------------- New: ---- jedit-encoding.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jedit.spec ++++++ --- /var/tmp/diff_new_pack.JDI6ds/_old 2017-09-20 17:10:08.755051048 +0200 +++ /var/tmp/diff_new_pack.JDI6ds/_new 2017-09-20 17:10:08.759050485 +0200 @@ -1,7 +1,7 @@ # # spec file for package jedit # -# Copyright (c) 2014 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 @@ -22,7 +22,7 @@ Release: 0 Summary: Programmer's Text Editor Written in Java License: GPL-2.0+ -Group: Productivity/Editors/Other +Group: Productivity/Text/Editors Url: http://www.jedit.org/ Source0: http://download.sourceforge.net/jedit/jedit%{version}source.tar.bz2 Source1: %{name}-16.png @@ -33,6 +33,7 @@ Source6: http://prdownloads.sourceforge.net/jedit-plugins/QuickNotepad-5.0.tgz #svn co https://jedit.svn.sourceforge.net/svnroot/jedit/build-support/trunk build-support Source7: build-support-r22713.tar.gz +Patch0: jedit-encoding.patch BuildRequires: ant >= 1.8.2 BuildRequires: ant-apache-bsf BuildRequires: ant-contrib @@ -48,7 +49,6 @@ BuildRequires: jsr-305 BuildRequires: junit BuildRequires: xerces-j2-xml-apis -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -73,13 +73,14 @@ %package javadoc Summary: Programmer's text editor written in Java (Documentation) -Group: Productivity/Editors/Other +Group: Productivity/Text/Editors %description javadoc Javadoc for %{summary}. %prep %setup -q -D -n jEdit -a 6 -a 7 +%patch0 -p1 find . -name '*jar' -delete @@ -117,13 +118,13 @@ export CLASSPATH=$(build-classpath apache-commons-logging xerces-j2-xml-apis) # Run the build # XXX: there's NPE on build-docs, but who care about html docs those times, right? -ant -Divy.done=true build docs-javadoc +ant -Dtarget.java.version=1.6 -Divy.done=true build docs-javadoc # plugins-build hardcodes the jedit.jar path - so to make it happy ln -s build/jedit.jar pushd QuickNotepad -ant +ant -Dtarget.java.version=1.6 popd mv QuickNotepad.jar build/jars rm build/jars/HACK @@ -171,7 +172,6 @@ %desktop_database_postun %files -%defattr(0644,root,root,0755) %attr(0755,root,root) %{_bindir}/%{name} %{_javadir}/%{name}.jar %{_datadir}/%{name}/ @@ -181,7 +181,6 @@ %exclude %{_datadir}/%{name}/doc/api %files javadoc -%defattr(0644,root,root,0755) %doc %{_javadocdir}/%{name} %{_datadir}/%{name}/doc/api ++++++ jedit-encoding.patch ++++++ --- jEdit/build.xml 2017-09-19 00:37:45.034686782 +0200 +++ jEdit/build.xml 2017-09-19 00:45:49.916917830 +0200 @@ -790,7 +790,8 @@ source="${target.java.version}" encoding="UTF-8" docencoding="UTF-8" - charset="UTF-8"> + charset="UTF-8" + additionalparam="-J-Dfile.encoding=UTF-8"> <group title="jEdit 5 API" packages="org.jedit.*"/> <group title="jEdit 4 API"
