Hello community, here is the log from the commit of package concurrent for openSUSE:Factory checked in at 2017-09-15 22:31:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/concurrent (Old) and /work/SRC/openSUSE:Factory/.concurrent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "concurrent" Fri Sep 15 22:31:11 2017 rev:16 rq:526190 version:1.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/concurrent/concurrent.changes 2017-05-22 10:49:06.523169922 +0200 +++ /work/SRC/openSUSE:Factory/.concurrent.new/concurrent.changes 2017-09-15 22:31:12.320361254 +0200 @@ -1,0 +2,10 @@ +Thu Sep 14 16:37:02 UTC 2017 - [email protected] + +- Allow building with other JDK then gcj +- Build with java source and target level 1.6 in order to allow + building with jdk9 +- Added patch: + * concurrent-jdk8.patch + + Fix a name clash that exist from jdk8 + +------------------------------------------------------------------- New: ---- concurrent-jdk8.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ concurrent.spec ++++++ --- /var/tmp/diff_new_pack.UHQrLQ/_old 2017-09-15 22:31:13.016263226 +0200 +++ /var/tmp/diff_new_pack.UHQrLQ/_new 2017-09-15 22:31:13.020262663 +0200 @@ -25,12 +25,9 @@ Url: http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/ Source0: http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/current/concurrent.tar.gz Source1: %{name}-%{version}.build.xml +Patch0: concurrent-jdk8.patch BuildRequires: ant -BuildRequires: java-1_5_0-gcj-compat-devel -#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel -#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel -#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel -#!BuildIgnore: java-9-openjdk java-9-openjdk-devel +BuildRequires: java-devel >= 1.6 Obsoletes: %{name}-javadoc BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -45,12 +42,12 @@ %prep %setup -q -c +%patch0 -p0 mkdir -p src/EDU/oswego/cs/dl/util mv concurrent src/EDU/oswego/cs/dl/util cp %{SOURCE1} build.xml %build -#export JAVA_HOME="/usr/lib64/jvm/jre" ant \ -Dversion=%{version} \ -Dj2se.apiurl=%{_javadocdir}/java \ ++++++ concurrent-1.3.4.build.xml ++++++ --- /var/tmp/diff_new_pack.UHQrLQ/_old 2017-09-15 22:31:13.060257029 +0200 +++ /var/tmp/diff_new_pack.UHQrLQ/_new 2017-09-15 22:31:13.060257029 +0200 @@ -15,8 +15,8 @@ debug="on" optimize="on" destdir="${build}" - source="1.5" - target="1.5" + source="1.6" + target="1.6" /> </target> ++++++ concurrent-jdk8.patch ++++++ --- concurrent/ConcurrentHashMap.java 2002-04-01 00:26:24.000000000 +0200 +++ concurrent/ConcurrentHashMap.java 2017-09-14 18:31:06.532780244 +0200 @@ -654,7 +654,7 @@ * <code>null</code>. */ public Object remove(Object key) { - return remove(key, null); + return removeCompat(key, null); } @@ -673,7 +673,7 @@ * <code>null</code>. */ - protected Object remove(Object key, Object value) { + protected Object removeCompat(Object key, Object value) { /* Find the entry, then 1. Set value field to null, to force get() to retry @@ -944,7 +944,7 @@ if (!(o instanceof Map.Entry)) return false; Map.Entry e = (Map.Entry)o; - return ConcurrentHashMap.this.remove(e.getKey(), e.getValue()) != null; + return ConcurrentHashMap.this.removeCompat(e.getKey(), e.getValue()) != null; } public int size() { return ConcurrentHashMap.this.size();
