From d44ae3b5c7926f002d878c715e95d736481815603ca7ebb389fcf49fd72ba72a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 9 Dec 2017 09:41:25 +0000 Subject: [PATCH 1/2] Accepting request 548489 from home:NicoK:branches:KDE:Extra - Update to 4.18.0 + show SSL certificate hashes as MD5, SHA1, and SHA512 OBS-URL: https://build.opensuse.org/request/show/548489 OBS-URL: https://build.opensuse.org/package/show/Office/gwenhywfar?expand=0&rev=3 --- gwenhywfar-4.17.0.tar.gz | 3 --- gwenhywfar-4.18.0.tar.gz | 3 +++ gwenhywfar.changes | 6 ++++++ gwenhywfar.spec | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 gwenhywfar-4.17.0.tar.gz create mode 100644 gwenhywfar-4.18.0.tar.gz diff --git a/gwenhywfar-4.17.0.tar.gz b/gwenhywfar-4.17.0.tar.gz deleted file mode 100644 index 2b01c16..0000000 --- a/gwenhywfar-4.17.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11fdffaa2970c937251587fc62a41893c20f7ab3d74c2b66dfa81f40b2a82bfd -size 2364605 diff --git a/gwenhywfar-4.18.0.tar.gz b/gwenhywfar-4.18.0.tar.gz new file mode 100644 index 0000000..5a3508c --- /dev/null +++ b/gwenhywfar-4.18.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6915bba42d8b7f0213cee186a944296e5e5e97cdbde5b539a924261af03086ca +size 2333059 diff --git a/gwenhywfar.changes b/gwenhywfar.changes index a01e52c..3dcc7cf 100644 --- a/gwenhywfar.changes +++ b/gwenhywfar.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 4 22:59:04 UTC 2017 - nico.kruber@gmail.com + +- Update to 4.18.0 + + show SSL certificate hashes as MD5, SHA1, and SHA512 + ------------------------------------------------------------------- Mon Nov 27 10:00:09 UTC 2017 - dimstar@opensuse.org diff --git a/gwenhywfar.spec b/gwenhywfar.spec index 178d2a1..acdb056 100644 --- a/gwenhywfar.spec +++ b/gwenhywfar.spec @@ -18,9 +18,9 @@ %bcond_with qt4 %define libversion 60 -%define devversion 4.17 +%define devversion 4.18 Name: gwenhywfar -Version: 4.17.0 +Version: 4.18.0 Release: 0 Summary: Multiplatform helper library for other libraries License: GPL-2.0+ and LGPL-2.1+ From ae33a140b60eda67ff12f908b66b08623912e50de80e1e9883a75e15645422e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 11 Dec 2017 13:51:52 +0000 Subject: [PATCH 2/2] Accepting request 555976 from home:wolfi323:branches:Office - Re-enable Qt4 front-end, kmymoney still needs it for its kbanking plugin - BuildIgnore libopenssl-1_0_0-devel to avoid openssl conflict on Tumbleweed OBS-URL: https://build.opensuse.org/request/show/555976 OBS-URL: https://build.opensuse.org/package/show/Office/gwenhywfar?expand=0&rev=4 --- gwenhywfar.changes | 8 ++++++++ gwenhywfar.spec | 9 +++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gwenhywfar.changes b/gwenhywfar.changes index 3dcc7cf..856c2de 100644 --- a/gwenhywfar.changes +++ b/gwenhywfar.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Dec 11 13:02:15 UTC 2017 - wbauer@tmo.at + +- Re-enable Qt4 front-end, kmymoney still needs it for its kbanking + plugin +- BuildIgnore libopenssl-1_0_0-devel to avoid openssl conflict on + Tumbleweed + ------------------------------------------------------------------- Mon Dec 4 22:59:04 UTC 2017 - nico.kruber@gmail.com diff --git a/gwenhywfar.spec b/gwenhywfar.spec index acdb056..e52eff7 100644 --- a/gwenhywfar.spec +++ b/gwenhywfar.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%bcond_with qt4 +%bcond_without qt4 %define libversion 60 %define devversion 4.18 @@ -34,6 +34,9 @@ BuildRequires: gtk2-devel >= 1.4 BuildRequires: libgcrypt-devel >= 1.2.0 BuildRequires: libopenssl-devel %if %{with qt4} +%if 0%{?suse_version} >= 1500 +#!BuildIgnore: libopenssl-1_0_0-devel +%endif BuildRequires: libqt4-devel %endif BuildRequires: cmake(Qt5Concurrent) @@ -201,8 +204,10 @@ export CPP --disable-static \ %if %{with qt4} --with-qt4-libs=%{_libdir} \ + --with-guis="fox16 qt4 qt5 gtk2" \ +%else + --with-guis="fox16 qt5 gtk2" \ %endif - --with-guis="fox16 %{?with qt4:qt4} qt5 gtk2" \ --with-plugins-cfgmgr=all \ --with-pic %__make %{?smp_mflags}