Hello community, here is the log from the commit of package libjnidispatch for openSUSE:Factory checked in at 2018-06-19 12:04:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libjnidispatch (Old) and /work/SRC/openSUSE:Factory/.libjnidispatch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libjnidispatch" Tue Jun 19 12:04:51 2018 rev:21 rq:617349 version:4.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libjnidispatch/libjnidispatch.changes 2018-01-10 23:36:44.307602240 +0100 +++ /work/SRC/openSUSE:Factory/.libjnidispatch.new/libjnidispatch.changes 2018-06-19 12:04:54.615254619 +0200 @@ -1,0 +2,13 @@ +Tue Jun 12 06:17:20 UTC 2018 - [email protected] + +- Upstrem version 4.5.1 +- Modified patch: + * jna-4.5.0-nojavah.patch -> jna-4.5.1-nojavah.patch + + Rediff to changed context, rework dependency chain and do not + try to load urls in the no-network build environment +- Added patch: + * jna-no-werror.patch + + Disable -Werror to enable build with two new warnings +- Build with compatibility 1.8 + +------------------------------------------------------------------- Old: ---- 4.5.0.tar.gz jna-4.5.0-nojavah.patch jna-4.5.0.pom New: ---- 4.5.1.tar.gz jna-4.5.1-nojavah.patch jna-4.5.1.pom jna-no-werror.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libjnidispatch.spec ++++++ --- /var/tmp/diff_new_pack.liG8Gm/_old 2018-06-19 12:04:57.427150220 +0200 +++ /var/tmp/diff_new_pack.liG8Gm/_new 2018-06-19 12:04:57.431150071 +0200 @@ -18,18 +18,19 @@ Name: libjnidispatch -Version: 4.5.0 +Version: 4.5.1 Release: 0 Summary: Java Native Access (shared library) -License: LGPL-2.1+ OR Apache-2.0 +License: LGPL-2.1-or-later OR Apache-2.0 Group: Development/Libraries/Java Url: https://github.com/twall/jna Source0: https://github.com/twall/jna/archive/%{version}.tar.gz -Source1: jna-4.5.0.pom +Source1: jna-4.5.1.pom Source2: libjnidispatch-rpmlintrc Patch0: jna-build.patch Patch1: jna-getpeer.patch -Patch2: jna-4.5.0-nojavah.patch +Patch2: jna-4.5.1-nojavah.patch +Patch3: jna-no-werror.patch BuildRequires: ant BuildRequires: ant-junit BuildRequires: dos2unix @@ -41,7 +42,7 @@ BuildRequires: libffi-devel BuildRequires: xorg-x11-libX11-devel BuildRequires: xorg-x11-libXt-devel -Requires: java >= 1.6 +Requires: java >= 1.8 Provides: jna-native = %{version}-%{release} Obsoletes: jna-native < %{version}-%{release} @@ -88,6 +89,7 @@ %patch0 -p1 -b .orig %patch1 -p1 %patch2 -p1 +%patch3 -p1 #FIXME: DirectTest fails #rm test/com/sun/jna/DirectTest.java test/com/sun/jna/PerformanceTest.java @@ -102,7 +104,7 @@ platform-jar \ -Dcflags_extra.native="%{optflags}" \ -Dbuild-native=true \ - -Dcompatibility=1.6 \ + -Dcompatibility=1.8 \ -Ddynlink.native=true \ javadoc ++++++ 4.5.0.tar.gz -> 4.5.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/libjnidispatch/4.5.0.tar.gz /work/SRC/openSUSE:Factory/.libjnidispatch.new/4.5.1.tar.gz differ: char 12, line 1 ++++++ jna-4.5.0-nojavah.patch -> jna-4.5.1-nojavah.patch ++++++ --- /work/SRC/openSUSE:Factory/libjnidispatch/jna-4.5.0-nojavah.patch 2018-01-10 23:36:44.291602990 +0100 +++ /work/SRC/openSUSE:Factory/.libjnidispatch.new/jna-4.5.1-nojavah.patch 2018-06-19 12:04:54.567256401 +0200 @@ -1,7 +1,6 @@ -diff -urEbwB jna-4.5.0/build.xml jna-4.5.0.new/build.xml ---- jna-4.5.0/build.xml 2018-01-09 17:11:21.219709300 +0100 -+++ jna-4.5.0.new/build.xml 2018-01-09 17:15:20.658167071 +0100 -@@ -364,6 +364,7 @@ +--- jna-4.5.1/build.xml 2017-12-27 20:27:16.000000000 +0100 ++++ jna-4.5.1/build.xml 2018-06-12 08:12:51.563582824 +0200 +@@ -374,6 +374,7 @@ source="${compatibility}" target="${compatibility}" destdir="${classes}" @@ -9,10 +8,11 @@ includeantruntime="false" deprecation="on" debug="${debug}" -@@ -513,91 +514,10 @@ +@@ -664,94 +665,6 @@ + </jar> </target> - <target name="javah" depends="compile" unless="-native"> +- <target name="javah" depends="compile" unless="-native"> - <javah classpath="${classes}" destdir="${build.native}" force="yes"> - <class name="com.sun.jna.Function"/> - <class name="com.sun.jna.Native"/> @@ -58,10 +58,10 @@ - <equals arg1="${jni.md5}" arg2=""/> - </or> - </condition> - </target> - - <!-- Invalidate native libraries when native API changes --> - <target name="-native-api-check" depends="javah" unless="jni.valid"> +- </target> +- +- <!-- Invalidate native libraries when native API changes --> +- <target name="-native-api-check" depends="javah" unless="jni.valid"> - <echo>Invalidating native code, new checksum is ${md5}</echo> - <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/darwin.jar" overwrite="true"/> - <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/win32-x86.jar" overwrite="true"/> @@ -98,10 +98,21 @@ - <fileset dir="${build.native}" includes="*.o,*jnidispatch*"/> - </delete> - <fail>API for native code has changed, or javah output is inconsistent. Re-run this build after checking ${md5.file} or updating jni.version and jni.md5 in build.xml</fail> +- </target> +- + <target name=":rsrc"> + <condition property="-rsrc"> + <and> +@@ -790,7 +703,7 @@ + file="${rsrc}" byline="true"/> </target> - <target name=":rsrc"> -@@ -779,7 +699,6 @@ +- <target name="native" depends="-enable-native,-setup,javah,-native-api-check,rsrc" unless="-native" ++ <target name="native" depends="-enable-native,-setup,compile,rsrc" unless="-native" + description="Build native libraries. Use 'ant -DCC=xxx' to build using a compiler other than gcc"> + <property name="comment" value="# auto-generated by ant"/> + <replaceregexp match="^JNA_JNI_VERSION=.*" +@@ -931,7 +844,6 @@ <exec executable="${make}" dir="${native}" failonerror="true"> <arg value="JAVA_HOME=${jdk.home}"/> @@ -109,9 +120,16 @@ <arg value="DEBUG=${debug.native}"/> <arg value="CFLAGS_EXTRA=${cflags_extra.native}"/> <arg value="DYNAMIC_LIBFFI=${dynlink.native}"/> -diff -urEbwB jna-4.5.0/src/com/sun/jna/Function.java jna-4.5.0.new/src/com/sun/jna/Function.java ---- jna-4.5.0/src/com/sun/jna/Function.java 2018-01-09 17:11:21.279709300 +0100 -+++ jna-4.5.0.new/src/com/sun/jna/Function.java 2018-01-09 17:25:58.913813214 +0100 +@@ -1214,7 +1126,6 @@ + <doctitle>JNA API Documentation</doctitle> + <header>${header}</header> + <bottom>${footer}</bottom> +- <link href="http://download.oracle.com/javase/${compatibility}/docs/api/"/> + + <packageset dir="${src}" defaultexcludes="yes"> + <patternset> +--- jna-4.5.1/src/com/sun/jna/Function.java 2017-12-27 20:27:16.000000000 +0100 ++++ jna-4.5.1/src/com/sun/jna/Function.java 2018-06-12 08:09:21.662479140 +0200 @@ -21,6 +21,7 @@ */ package com.sun.jna; ++++++ jna-4.5.0.pom -> jna-4.5.1.pom ++++++ --- /work/SRC/openSUSE:Factory/libjnidispatch/jna-4.5.0.pom 2017-10-31 15:44:44.208171532 +0100 +++ /work/SRC/openSUSE:Factory/.libjnidispatch.new/jna-4.5.1.pom 2018-06-19 12:04:54.583255807 +0200 @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.sun.jna</groupId> <artifactId>jna</artifactId> - <version>4.5.0</version> + <version>4.5.1</version> <licenses> <license> <name>GNU Lesser General Public License, version 2.1 or later</name> ++++++ jna-no-werror.patch ++++++ --- a/native/Makefile +++ b/native/Makefile @@ -336,10 +336,10 @@ endif ifeq ($(CC),gcc) GCC_MAJOR_VERSION = $(shell gcc -dumpversion | cut -f 1 -d '.') ifneq ($(GCC_MAJOR_VERSION),4) - LOC_CC_OPTS=-Wno-unknown-warning-option -Werror -Wno-clobbered -Wno-unused-variable + LOC_CC_OPTS=-Wno-unknown-warning-option -Wno-clobbered -Wno-unused-variable endif else - LOC_CC_OPTS=-Wno-unknown-warning-option -Werror -Wno-clobbered -Wno-unused-variable + LOC_CC_OPTS=-Wno-unknown-warning-option -Wno-clobbered -Wno-unused-variable endif # Enable 64-bit builds if the arch demands it
