Hello community, here is the log from the commit of package J7Z for openSUSE:Factory checked in at 2018-03-22 12:06:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/J7Z (Old) and /work/SRC/openSUSE:Factory/.J7Z.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "J7Z" Thu Mar 22 12:06:14 2018 rev:5 rq:589680 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/J7Z/J7Z.changes 2018-02-02 22:21:59.682680862 +0100 +++ /work/SRC/openSUSE:Factory/.J7Z.new/J7Z.changes 2018-03-22 12:11:28.939984520 +0100 @@ -1,0 +2,10 @@ +Tue Mar 20 17:21:33 UTC 2018 - [email protected] + +- Update to version 1.4.1 + * Added initial support for JRE v9 + * Added icons for menu-bar entries + +- Fixed J7Z-jdk10.patch. +- Removed all kde4 stuff from spec file. + +------------------------------------------------------------------- Old: ---- J7Z-1.4.0-src.tar.bz2 New: ---- J7Z-1.4.1-src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ J7Z.spec ++++++ --- /var/tmp/diff_new_pack.JZA2GA/_old 2018-03-22 12:11:29.687957711 +0100 +++ /var/tmp/diff_new_pack.JZA2GA/_new 2018-03-22 12:11:29.691957568 +0100 @@ -20,13 +20,13 @@ %bcond_without kf5 %endif Name: J7Z -Version: 1.4.0 +Version: 1.4.1 Release: 0 Summary: Java-based P7Zip GUI for data compression and backup License: LGPL-3.0+ 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 +Source: https://downloads.sourceforge.net/project/k7z/J7Z%%20%%28All%%29/1.4.1/J7Z-1.4.1-src.tar.bz2 Patch0: J7Z-jdk10.patch BuildRequires: ImageMagick BuildRequires: ant >= 1.8.0 @@ -41,8 +41,6 @@ BuildArch: noarch %if %{with kf5} BuildRequires: kf5-filesystem -%else -BuildRequires: kde4-filesystem %endif %if 0%{?suse_version} > 1320 BuildRequires: strip-nondeterminism @@ -63,17 +61,6 @@ %description kf5 J7Z is an alternative 7-Zip GUI. This package contains the KF5 service menu. - -%else -%package kde4 -Summary: KDE4 servicemenu for J7Z -Group: Productivity/Archiving/Compression -Requires: J7Z -%{kde4_runtime_requires} - -%description kde4 -J7Z is an alternative 7-Zip GUI. -This package contains the KDE4 service menu. %endif %prep @@ -106,8 +93,7 @@ echo "X-SuSE-translate=true" >> %{buildroot}%{_kf5_servicesdir}/ServiceMenus/J7Z-Extract.desktop rm -rf %{buildroot}%{_datadir}/kde4 %else -echo "X-SuSE-translate=true" >> %{buildroot}%{_kde4_servicesdir}/ServiceMenus/J7Z-Create.desktop -echo "X-SuSE-translate=true" >> %{buildroot}%{_kde4_servicesdir}/ServiceMenus/J7Z-Extract.desktop +rm -rf %{buildroot}%{_datadir}/kde4 rm -rf %{buildroot}%{_datadir}/kservices5 %endif echo "X-SuSE-translate=true" >> %{buildroot}%{_datadir}/J7Z/Desktop/KDE/J7Z-Create.desktop @@ -129,10 +115,6 @@ %defattr(-,root,root) %dir %{_kf5_servicesdir}/ServiceMenus %{_kf5_servicesdir}/ServiceMenus/*.desktop -%else -%files kde4 -%defattr(-,root,root) -%{_kde4_servicesdir}/ServiceMenus/*.desktop %endif %changelog ++++++ J7Z-1.4.0-src.tar.bz2 -> J7Z-1.4.1-src.tar.bz2 ++++++ ++++ 1747 lines of diff (skipped) ++++++ J7Z-jdk10.patch ++++++ --- /var/tmp/diff_new_pack.JZA2GA/_old 2018-03-22 12:11:30.171940365 +0100 +++ /var/tmp/diff_new_pack.JZA2GA/_new 2018-03-22 12:11:30.175940221 +0100 @@ -4,8 +4,8 @@ # 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-Ver = $(shell $(Java) -version 2>&1 | grep -v "^Picked up _JAVA_OPTIONS:" | awk 'NR==1{print $$3}' | sed -e 's/^"//' -e 's/"$$//' | cut -c 1-3) ++ Java-Ver = $(shell $(Java) -version 2>&1 | grep -v "^Picked up _JAVA_OPTIONS:" | 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) @@ -13,8 +13,8 @@ # 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) +- JavaC-Ver = $(shell $(JavaC) -version 2>&1 | grep -v "^Picked up _JAVA_OPTIONS:" | awk 'NR==1{print $$2}' | sed -e 's/^"//' -e 's/"$$//' | cut -c 1-3) ++ JavaC-Ver = $(shell $(JavaC) -version 2>&1 | grep -v "^Picked up _JAVA_OPTIONS:" | awk 'NR==1{print $$2}' | sed -e 's/^"//' -e 's/"$$//' -e 's/-/\ /g | cut -c 1-3) endif # Apache Ant
