Hello community,
here is the log from the commit of package flexdock for openSUSE:Factory
checked in at 2017-09-20 17:08:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/flexdock (Old)
and /work/SRC/openSUSE:Factory/.flexdock.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "flexdock"
Wed Sep 20 17:08:30 2017 rev:3 rq:526952 version:1.2.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/flexdock/flexdock.changes 2014-05-06
17:40:18.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.flexdock.new/flexdock.changes 2017-09-20
17:08:33.148509560 +0200
@@ -1,0 +2,8 @@
+Mon Sep 18 07:51:12 UTC 2017 - fst...@suse.com
+
+- Added patch:
+ * flexdock-1.2.4-jdk9.patch
+ + Fix build with jdk9
+ + Specify java source and target version 1.6
+
+-------------------------------------------------------------------
New:
----
flexdock-1.2.4-jdk9.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ flexdock.spec ++++++
--- /var/tmp/diff_new_pack.6WuCsM/_old 2017-09-20 17:08:33.868408220 +0200
+++ /var/tmp/diff_new_pack.6WuCsM/_new 2017-09-20 17:08:33.872407657 +0200
@@ -1,7 +1,7 @@
#
# spec file for package flexdock
#
-# 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
@@ -28,7 +28,7 @@
Patch1: flexdock-nojmf.patch
# PATCH-FIX-OPENSUSE flexdock-build.patch
Patch2: flexdock-build.patch
-
+Patch3: flexdock-1.2.4-jdk9.patch
BuildRequires: ant
BuildRequires: java-devel
BuildRequires: jgoodies-looks
@@ -39,7 +39,6 @@
Requires: jgoodies-looks
Requires: jpackage-utils
Requires: skinlf
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@@ -60,6 +59,7 @@
%patch1 -p1
%patch2 -p1
+%patch3 -p1
# fix wrong-file-end-of-line-encoding
sed -i 's/\r$//' README
@@ -76,7 +76,7 @@
rm src/java/demo/org/flexdock/demos/raw/jmf/JMFDemo.java
%build
-%ant jar
+%{ant} jar
%install
# jars
@@ -84,7 +84,6 @@
ln -sf %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%files
-%defattr(-,root,root)
%doc LICENSE.txt README release-notes.txt
%{_javadir}/*.jar
++++++ flexdock-1.2.4-jdk9.patch ++++++
--- flexdock-1.2.4/build.xml 2017-09-18 09:47:31.454613558 +0200
+++ flexdock-1.2.4/build.xml 2017-09-18 09:49:13.118615294 +0200
@@ -110,7 +110,7 @@
<target name="compile" depends="init, resources"
description="Compile java sources for the framework, demos, and
tests">
- <javac classpathref="javac.classpath" destdir="${bin.dir}" debug="true"
source="1.5" target="1.5" includeAntRuntime="no">
+ <javac classpathref="javac.classpath" destdir="${bin.dir}" debug="true"
source="1.6" target="1.6" includeAntRuntime="no">
<compilerarg value="-Xlint"/>
<src path="${java.src.core}" />
<!-- the next 3 are interdependent -->
@@ -120,8 +120,8 @@
<src path="${java.src.drag}"/>
<src path="${java.src.perspective}"/>
</javac>
- <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}"
destdir="${bin.dir.demo}" debug="true" source="1.5" target="1.5"
includeAntRuntime="no"/>
- <javac classpathref="javac.classpath.test" srcdir="${java.src.test}"
destdir="${bin.dir.test}" debug="true" source="1.5" target="1.5"
includeAntRuntime="no"/>
+ <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}"
destdir="${bin.dir.demo}" debug="true" source="1.6" target="1.6"
includeAntRuntime="no"/>
+ <javac classpathref="javac.classpath.test" srcdir="${java.src.test}"
destdir="${bin.dir.test}" debug="true" source="1.6" target="1.6"
includeAntRuntime="no"/>
</target>
@@ -213,7 +213,7 @@
<packageset dir="${java.src.drag}" />
<packageset dir="${java.src.perspective}" />
<packageset dir="${java.src.view}" />
- <link href="http://java.sun.com/j2se/1.5.0/docs/api/"; />
+ <link href="http://java.sun.com/j2se/1.6.0/docs/api/"; />
<!-- add links to the j2se 1.4 docs -->
</javadoc>
</target>
