Hello community,

here is the log from the commit of package J7Z for openSUSE:Factory checked in 
at 2018-02-02 22:21:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/J7Z (Old)
 and      /work/SRC/openSUSE:Factory/.J7Z.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "J7Z"

Fri Feb  2 22:21:57 2018 rev:4 rq:571909 version:1.4.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/J7Z/J7Z.changes  2017-05-03 15:58:21.982262705 
+0200
+++ /work/SRC/openSUSE:Factory/.J7Z.new/J7Z.changes     2018-02-02 
22:21:59.682680862 +0100
@@ -1,0 +2,8 @@
+Fri Feb  2 06:44:22 UTC 2018 - fst...@suse.com
+
+- Added patch:
+  * J7Z-jdk10.patch
+    + fix build with jdk10 preview or other jdk versions that
+      have the optional string appended to its version.
+
+-------------------------------------------------------------------

New:
----
  J7Z-jdk10.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ J7Z.spec ++++++
--- /var/tmp/diff_new_pack.BHxDdj/_old  2018-02-02 22:22:00.882624842 +0100
+++ /var/tmp/diff_new_pack.BHxDdj/_new  2018-02-02 22:22:00.886624655 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package J7Z
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -27,6 +27,7 @@
 Group:          Productivity/Archiving/Compression
 Url:            http://j7z.xavion.name
 Source:         
https://downloads.sourceforge.net/project/k7z/J7Z%%20%%28All%%29/1.4.0/J7Z-1.4.0-src.tar.bz2
+Patch0:         J7Z-jdk10.patch
 BuildRequires:  ImageMagick
 BuildRequires:  ant >= 1.8.0
 BuildRequires:  fdupes
@@ -77,6 +78,7 @@
 
 %prep
 %setup -q -n J7Z
+%patch0 -p1
 sed -i -e 's|Qt;KDE;Utility;Archiving;Compression|Qt;KDE;Utility;Archiving|g' \
        Linux/Desktop/Menu/J7Z.desktop
 

++++++ J7Z-jdk10.patch ++++++
--- J7Z/Linux/Build/Makefile    2018-02-02 07:37:38.602000593 +0100
+++ J7Z/Linux/Build/Makefile    2018-02-02 07:41:05.712654242 +0100
@@ -69,7 +69,7 @@
 # Java
 Java = $(shell which java 2> /dev/null)
 ifneq "$(Java)" ""
-       Java-Ver = $(shell $(Java) -version 2>&1 | awk 'NR==1{print $$3}' | sed 
-e 's/^"//' -e 's/"$$//' | cut -c 1-3)
+       Java-Ver = $(shell $(Java) -version 2>&1 | awk 'NR==1{print $$3}' | sed 
-e 's/^"//' -e 's/"$$//' -e 's/-/\ /g' | cut -c 1-3)
        Java-Major := $(shell echo $(Java-Ver) | cut -f1 -d.)
        Java-Minor := $(shell echo $(Java-Ver) | cut -f2 -d.)
        Java-OK := $(shell [ $(Java-Major) -gt 1 -o \( $(Java-Major) -eq 1 -a 
$(Java-Minor) -ge 7 \) ] && echo true)
@@ -78,7 +78,7 @@
 # Java compiler
 JavaC = $(shell which javac 2> /dev/null)
 ifneq "$(JavaC)" ""
-       JavaC-Ver = $(shell $(JavaC) -version 2>&1 | awk 'NR==1{print $$2}' | 
sed -e 's/^"//' -e 's/"$$//' | cut -c 1-3)
+       JavaC-Ver = $(shell $(JavaC) -version 2>&1 | awk 'NR==1{print $$2}' | 
sed -e 's/^"//' -e 's/"$$//' -e 's/-/\ /g'  | cut -c 1-3)
 endif
 
 # Apache Ant

Reply via email to