Hello community,
here is the log from the commit of package netbeans-svnclientadapter for
openSUSE:Factory checked in at 2017-09-20 17:12:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/netbeans-svnclientadapter (Old)
and /work/SRC/openSUSE:Factory/.netbeans-svnclientadapter.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netbeans-svnclientadapter"
Wed Sep 20 17:12:53 2017 rev:16 rq:527347 version:6.7.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/netbeans-svnclientadapter/netbeans-svnclientadapter.changes
2014-07-11 20:05:59.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.netbeans-svnclientadapter.new/netbeans-svnclientadapter.changes
2017-09-20 17:12:59.754979504 +0200
@@ -1,0 +2,10 @@
+Tue Sep 19 15:30:58 UTC 2017 - [email protected]
+
+- Specify java source and target level 1.6: fix build with jdk9
+- Modified patch:
+ * svnClientAdapter-1.6.0-build.patch
+ + specify encoding ISO-8859-1 for all files. Some of them are
+ UTF-8, some are ISO-8859-1. But it looks like UTF-8 can
+ be considered a valid ISO-8859-1 and the build works.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netbeans-svnclientadapter.spec ++++++
--- /var/tmp/diff_new_pack.57pHXV/_old 2017-09-20 17:13:00.358894490 +0200
+++ /var/tmp/diff_new_pack.57pHXV/_new 2017-09-20 17:13:00.358894490 +0200
@@ -1,7 +1,7 @@
#
# spec file for package netbeans-svnclientadapter
#
-# 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
@@ -45,7 +45,6 @@
Requires: java >= 1.6.0
Requires: javapackages-tools
Requires: subversion
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@@ -63,7 +62,10 @@
%build
[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
-ant -verbose svnClientAdapter.jar
+ant \
+ -verbose \
+ -DtargetJvm=1.6 \
+ svnClientAdapter.jar
%install
# jar
@@ -72,7 +74,6 @@
ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%files
-%defattr(-,root,root)
%doc license.txt readme.txt
%{_javadir}/*
++++++ svnClientAdapter-1.6.0-build.patch ++++++
--- /var/tmp/diff_new_pack.57pHXV/_old 2017-09-20 17:13:00.398888860 +0200
+++ /var/tmp/diff_new_pack.57pHXV/_new 2017-09-20 17:13:00.402888298 +0200
@@ -1,6 +1,5 @@
-diff -Nur svnClientAdapter-1.6.0/build.properties
svnClientAdapter-1.6.0.new/build.properties
---- svnClientAdapter-1.6.0/build.properties 2007-08-27 18:37:03.000000000
+0400
-+++ svnClientAdapter-1.6.0.new/build.properties 2009-08-11
22:50:17.000000000 +0400
+--- svnClientAdapter-1.6.0/build.properties 2007-08-27 16:37:03.000000000
+0200
++++ svnClientAdapter-1.6.0/build.properties 2017-09-19 17:25:52.781134873
+0200
@@ -34,10 +34,10 @@
#
-----------------------------------------------------------------------------
# all jar needed
@@ -16,10 +15,9 @@
#
-----------------------------------------------------------------------------
# JavaHL win32 lib dir
-diff -Nur svnClientAdapter-1.6.0/build.xml svnClientAdapter-1.6.0.new/build.xml
---- svnClientAdapter-1.6.0/build.xml 2007-08-27 18:37:03.000000000 +0400
-+++ svnClientAdapter-1.6.0.new/build.xml 2009-08-11 20:06:01.000000000
+0400
-@@ -32,12 +32,14 @@
+--- svnClientAdapter-1.6.0/build.xml 2007-08-27 16:37:03.000000000 +0200
++++ svnClientAdapter-1.6.0/build.xml 2017-09-19 17:28:39.177137713 +0200
+@@ -32,15 +32,18 @@
<depend srcDir="${src.javahl.dir}"
destDir="${build.classes.dir}"
cache="${build.cache.dir}"/>
@@ -34,7 +32,17 @@
<javac srcdir="${src.main.dir}"
destdir="${build.classes.dir}"
debug="${debug}"
-@@ -54,6 +56,7 @@
++ encoding="ISO-8859-1"
+ source="${targetJvm}"
+ target="${targetJvm}"
+ includes="**"
+@@ -49,27 +52,34 @@
+ <javac srcdir="${src.javahl.dir}"
+ destdir="${build.classes.dir}"
+ debug="${debug}"
++ encoding="ISO-8859-1"
+ source="${targetJvm}"
+ target="${targetJvm}"
includes="**"
classpathref="project.classpath">
</javac>
@@ -42,7 +50,9 @@
<javac srcdir="${src.svnkit.dir}"
destdir="${build.classes.dir}"
debug="${debug}"
-@@ -62,6 +65,8 @@
++ encoding="ISO-8859-1"
+ source="${targetJvm}"
+ target="${targetJvm}"
includes="**"
classpathref="project.classpath">
</javac>
@@ -51,7 +61,9 @@
<javac srcdir="${src.cmdline.dir}"
destdir="${build.classes.dir}"
debug="${debug}"
-@@ -70,6 +75,7 @@
++ encoding="ISO-8859-1"
+ source="${targetJvm}"
+ target="${targetJvm}"
includes="**"
classpathref="project.classpath">
</javac>
@@ -59,3 +71,22 @@
<copy todir="${build.classes.dir}">
<fileset dir="${src.main.dir}">
<exclude name="**/*.java"/>
+@@ -85,6 +95,8 @@
+ <javadoc sourcepath="${src.main.dir}"
+ classpathref="project.classpath"
+ destdir="${build.javadoc.dir}"
++ source="${targetJvm}"
++ encoding="ISO-8859-1"
+ packagenames="org.*"
+ windowtitle="svnClientAdapter API"
+ doctitle="svnClientAdapter">
+@@ -214,6 +226,9 @@
+ <javac srcdir="${src.tests.dir}"
+ destdir="${build.testClasses.dir}"
+ debug="${debug}"
++ encoding="ISO-8859-1"
++ source="${targetJvm}"
++ target="${targetJvm}"
+ includes="**">
+ <classpath>
+ <pathelement location="${build.classes.dir}"/>
