- updated to 5.10.2

diff --git a/gwenhywfar-link.patch b/gwenhywfar-link.patch
new file mode 100644 (file)
index 0000000..9c43d12
--- /dev/null
+++ b/gwenhywfar-link.patch
@@ -0,0 +1,20 @@
+Avoid -L/usr/lib* during libgwengui-qt4 linking to use newly built libgwengui-cpp instead of system one.
+
+--- gwenhywfar-5.10.2/m4/qt4.m4.orig   2019-09-24 22:32:09.000000000 +0200
++++ gwenhywfar-5.10.2/m4/qt4.m4        2023-10-26 19:51:25.941284777 +0200
+@@ -132,10 +132,13 @@ if test -z "$qt4_libs"; then
+    AQ_SEARCH_FOR_PATH([$qt_searchname],[$local_qt4_libs])
+    if test -n "$found_dir" ; then
+      if test "x$host" = "xi686-w64-mingw32" || test "x$host" = "xx86_64-w64-mingw32"; then
+-       qt4_libs="-L$found_dir -l${qt_libname}4 -lQtCore4 -no-undefined"
++       qt4_libs="-l${qt_libname}4 -lQtCore4 -no-undefined"
+      else
+-     qt4_libs="-L$found_dir -l${qt_libname} -lQtCore"
++     qt4_libs="-l${qt_libname} -lQtCore"
+    fi
++     if test "$found_dir" != "$libdir"; then
++       qt4_libs="-L$found_dir $qt4_libs"
++     fi
+    fi
+ fi
+ 

diff --git a/gwenhywfar.spec b/gwenhywfar.spec
index 66ceed88d54c0200766beeeac50ecafefec029f9..5f9d653e8d0a949e06859dca2882544c9e17cef9 100644 (file)
--- a/gwenhywfar.spec
+++ b/gwenhywfar.spec
@@ -1,6 +1,5 @@
 #
 # TODO: - define _one_, system-wide place for ca-bundle.crt and use one, up-to-date file
-#      - fix qt5 link error and bring back qt5 gui subpackage
 #
 # Conditional build:
 %bcond_without fox             # FOX 1.6 GUI
@@ -18,15 +17,16 @@
 Summary:       Gwenhywfar - a multi-platform helper library for networking and security
 Summary(pl.UTF-8):     Gwenhywfar - wieloplatformowa biblioteka pomocnicza do sieci i bezpieczeństwa
 Name:          gwenhywfar
-Version:       5.7.3
-Release:       2
+Version:       5.10.2
+Release:       1
 License:       LGPL v2.1+ with OpenSSL linking exception
 Group:         Libraries
-# https://www.aquamaniac.de/sites/download/packages.php
-Source0:       https://www.aquamaniac.de/rdm/attachments/download/390/%{name}-%{version}.tar.gz
-# Source0-md5: ba92064a046501524064c926492ecc3d
+#Source0Download: https://www.aquamaniac.de/rdm/projects/gwenhywfar/files
+Source0:       https://www.aquamaniac.de/rdm/attachments/download/501/%{name}-%{version}.tar.gz
+# Source0-md5: a5d78549dcec73844d891c6a0a703e19
 Patch0:                gcc.patch
 Patch1:                %{name}-qt5.patch
+Patch2:                %{name}-link.patch
 URL:           https://www.aquamaniac.de/sites/aqbanking/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
@@ -373,6 +373,7 @@ aqbanking.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 # gettextize not used (custom support instead of AM_GNU_GETTEXT)