From 5e6040e4d048e5652c6e9b3e2609559fb3aa4471353a4760c292feadb60efc4f Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Thu, 21 Feb 2019 16:35:59 +0000 Subject: [PATCH 1/4] Accepting request 671147 from home:sbrabec:branches:security:chipcard - Update to version 4.99.8 (beta) required by libchipcard-5.1.2: * Generalization in the generic TLV to GWEN DB parser. * Sspeedup of GWEN_Date_dup (about factor 16). * Correctly read a UTF-8-encoded MT940 file. * Updated Gwengui-Gtk3. * API improvements. * Other fixes. OBS-URL: https://build.opensuse.org/request/show/671147 OBS-URL: https://build.opensuse.org/package/show/Office/gwenhywfar?expand=0&rev=7 --- gwenhywfar-4.20.1.tar.gz | 3 -- gwenhywfar-4.99.8beta.tar.gz | 3 ++ gwenhywfar.changes | 11 ++++++++ gwenhywfar.spec | 53 +++++++++++++++++++----------------- 4 files changed, 42 insertions(+), 28 deletions(-) delete mode 100644 gwenhywfar-4.20.1.tar.gz create mode 100644 gwenhywfar-4.99.8beta.tar.gz diff --git a/gwenhywfar-4.20.1.tar.gz b/gwenhywfar-4.20.1.tar.gz deleted file mode 100644 index ef04907..0000000 --- a/gwenhywfar-4.20.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efc4b9dcb51981e7c56e22ac6054ace396c3387667b134128d4e9fcad50544b8 -size 1607206 diff --git a/gwenhywfar-4.99.8beta.tar.gz b/gwenhywfar-4.99.8beta.tar.gz new file mode 100644 index 0000000..7cbf405 --- /dev/null +++ b/gwenhywfar-4.99.8beta.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8de79f4d63d15737481bc27116a872b031be10d889b00e7d3bf7483db47e35e +size 1625085 diff --git a/gwenhywfar.changes b/gwenhywfar.changes index 700ba78..a0dd565 100644 --- a/gwenhywfar.changes +++ b/gwenhywfar.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Jan 30 21:34:35 CET 2019 - sbrabec@suse.com + +- Update to version 4.99.8 (beta) required by libchipcard-5.1.2: + * Generalization in the generic TLV to GWEN DB parser. + * Sspeedup of GWEN_Date_dup (about factor 16). + * Correctly read a UTF-8-encoded MT940 file. + * Updated Gwengui-Gtk3. + * API improvements. + * Other fixes. + ------------------------------------------------------------------- Tue May 15 15:36:12 UTC 2018 - dimstar@opensuse.org diff --git a/gwenhywfar.spec b/gwenhywfar.spec index e1dfbcb..2e5f607 100644 --- a/gwenhywfar.spec +++ b/gwenhywfar.spec @@ -17,16 +17,19 @@ %bcond_without qt4 %bcond_with configure -%define libname libgwenhywfar60 -%define devversion 4.20 +%define libversion 78 +%define devversion 5 +%define devrelease 4.99 Name: gwenhywfar -Version: 4.20.1 +Version: 4.99.8 +# Beta does not mean "before release" but a release that is considered as beta: +%define _version %{version}beta Release: 0 Summary: Multiplatform helper library for other libraries License: GPL-2.0+ and LGPL-2.1+ Group: System/Libraries -Url: http://www.aqbanking.de/ -Source: https://github.com/aqbanking/gwenhywfar/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Url: https://www.aquamaniac.de/rdm/projects/gwenhywfar +Source: https://github.com/aqbanking/gwenhywfar/archive/%{_version}.tar.gz#/%{name}-%{_version}.tar.gz %if !%{with configure} BuildRequires: autoconf BuildRequires: automake @@ -65,7 +68,7 @@ BuildRequires: xorg-x11-fonts BuildRequires: pkgconfig(gnutls) >= 2.9.8 BuildRequires: pkgconfig(gtk+-2.0) >= 2.17.5 BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 -Recommends: %{libname} +Recommends: libgwenhywfar%{libversion} %description Gwenhywfar is a base library used to provide OS abstraction functions @@ -78,7 +81,7 @@ communication). Summary: Multiplatform Helper Library for Other Libraries - Tools License: GPL-2.0+ and LGPL-2.1+ Group: System/Libraries -Requires: %{libname} = %{version} +Requires: libgwenhywfar%{libversion} = %{version} %description tools Gwenhywfar is a base library used to provide OS abstraction functions @@ -87,27 +90,27 @@ some often needed functions (for example, for handling and parsing of configuration files, reading and writing of XML files, and interprocess communication). -%package -n %{libname}-plugins +%package -n libgwenhywfar%{libversion}-plugins Summary: Multiplatform Helper Library for Other Libraries - Plugins License: LGPL-2.1+ Group: System/Libraries Requires: %{name} = %{version} -%description -n %{libname}-plugins +%description -n libgwenhywfar%{libversion}-plugins Gwenhywfar is a base library used to provide OS abstraction functions for Linux, FreeBSD, OpenBSD, NetBSD, and Windows. It also includes some often needed functions (for example, for handling and parsing of configuration files, reading and writing of XML files, and interprocess communication). -%package -n %{libname} +%package -n libgwenhywfar%{libversion} Summary: Multiplatform Helper Library for Other Libraries License: LGPL-2.1+ Group: System/Libraries Recommends: %{name}-lang -Recommends: %{libname}-plugins = %{version} +Recommends: libgwenhywfar%{libversion}-plugins = %{version} -%description -n %{libname} +%description -n libgwenhywfar%{libversion} Gwenhywfar is a base library used to provide OS abstraction functions for Linux, FreeBSD, OpenBSD, NetBSD, and Windows. It also includes some often needed functions (for example, for handling and parsing of @@ -192,7 +195,7 @@ Summary: Multi-Platform Helper Library for Other Libraries License: LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: glibc-devel -Requires: %{libname} = %{version} +Requires: libgwenhywfar%{libversion} = %{version} Requires: libgwengui-fox16-0 = %{version} Requires: libgwengui-gtk2-0 = %{version} Requires: libgwengui-gtk3-0 = %{version} @@ -210,7 +213,7 @@ communication etc). %lang_package %prep -%setup -q +%setup -q -n %{name}-%{_version} %build export PATH=%{_libqt5_bindir}:$PATH @@ -251,8 +254,8 @@ find %{buildroot} -type f -name "*.la" -delete -print %fdupes %{buildroot}%{_datadir}/%{name}/apidoc %fdupes %{buildroot}%{_libdir}/cmake -%post -n %{libname} -p /sbin/ldconfig -%postun -n %{libname} -p /sbin/ldconfig +%post -n libgwenhywfar%{libversion} -p /sbin/ldconfig +%postun -n libgwenhywfar%{libversion} -p /sbin/ldconfig %post -n libgwengui-cpp0 -p /sbin/ldconfig %postun -n libgwengui-cpp0 -p /sbin/ldconfig @@ -281,7 +284,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_datadir}/%{name}/dialogs/ %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/plugins -%dir %{_libdir}/%{name}/plugins/60 +%dir %{_libdir}/%{name}/plugins/%{libversion} %exclude %{_docdir}/%{name}/api %files tools @@ -293,10 +296,10 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_bindir}/xmlmerge %{_datadir}/%{name}/typemaker2/ -%files -n %{libname}-plugins -%{_libdir}/%{name}/plugins/60/* +%files -n libgwenhywfar%{libversion}-plugins +%{_libdir}/%{name}/plugins/%{libversion}/* -%files -n %{libname} +%files -n libgwenhywfar%{libversion} %{_libdir}/lib%{name}.so.* %files -n libgwengui-cpp0 @@ -324,21 +327,21 @@ find %{buildroot} -type f -name "*.la" -delete -print %dir %{_datadir}/aclocal %{_datadir}/aclocal/%{name}.m4 %doc %{_docdir}/%{name}/api/ -%{_includedir}/%{name}4/ +%{_includedir}/%{name}%{devversion}/ %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/gwengui-gtk2.pc %{_libdir}/pkgconfig/gwengui-gtk3.pc %if %{with qt4} %{_libdir}/pkgconfig/gwengui-qt4.pc -%{_libdir}/cmake/gwengui-qt4-%{devversion} +%{_libdir}/cmake/gwengui-qt4-%{devrelease} %endif %{_libdir}/pkgconfig/gwengui-qt5.pc %{_libdir}/pkgconfig/gwengui-fox16.pc %dir %{_libdir}/cmake -%{_libdir}/cmake/%{name}-%{devversion} -%{_libdir}/cmake/gwengui-cpp-%{devversion} -%{_libdir}/cmake/gwengui-qt5-%{devversion} +%{_libdir}/cmake/%{name}-%{devrelease} +%{_libdir}/cmake/gwengui-cpp-%{devrelease} +%{_libdir}/cmake/gwengui-qt5-%{devrelease} %files lang -f %{name}.lang From 76b53b7747fa7e9e7aa7c1e80ecf5414685cb94bd2cc00d73a2197a356e509c8 Mon Sep 17 00:00:00 2001 From: Michele Bologna Date: Sun, 21 Apr 2019 20:38:46 +0000 Subject: [PATCH 2/4] Accepting request 691793 from home:cgiboudeaux:branches:Office - Prepare the KDE4/Qt4 removal from factory. - Run spec-cleaner OBS-URL: https://build.opensuse.org/request/show/691793 OBS-URL: https://build.opensuse.org/package/show/Office/gwenhywfar?expand=0&rev=8 --- gwenhywfar.changes | 6 +++ gwenhywfar.spec | 118 +++++++++++++++------------------------------ 2 files changed, 44 insertions(+), 80 deletions(-) diff --git a/gwenhywfar.changes b/gwenhywfar.changes index a0dd565..78e72c8 100644 --- a/gwenhywfar.changes +++ b/gwenhywfar.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 25 17:48:25 UTC 2019 - Christophe Giboudeaux + +- Prepare the KDE4/Qt4 removal from factory. +- Run spec-cleaner + ------------------------------------------------------------------- Wed Jan 30 21:34:35 CET 2019 - sbrabec@suse.com diff --git a/gwenhywfar.spec b/gwenhywfar.spec index 2e5f607..4d73532 100644 --- a/gwenhywfar.spec +++ b/gwenhywfar.spec @@ -1,7 +1,7 @@ # # spec file for package gwenhywfar # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,29 +12,24 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%bcond_without qt4 -%bcond_with configure + %define libversion 78 %define devversion 5 %define devrelease 4.99 -Name: gwenhywfar -Version: 4.99.8 # Beta does not mean "before release" but a release that is considered as beta: %define _version %{version}beta +%bcond_with configure +Name: gwenhywfar +Version: 4.99.8 Release: 0 Summary: Multiplatform helper library for other libraries -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Libraries -Url: https://www.aquamaniac.de/rdm/projects/gwenhywfar +URL: https://www.aquamaniac.de/rdm/projects/gwenhywfar Source: https://github.com/aqbanking/gwenhywfar/archive/%{_version}.tar.gz#/%{name}-%{_version}.tar.gz -%if !%{with configure} -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool -%endif BuildRequires: doxygen BuildRequires: fdupes # For doc graphs @@ -42,12 +37,8 @@ BuildRequires: graphviz BuildRequires: graphviz-gd 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: pkgconfig +BuildRequires: xorg-x11-fonts BuildRequires: cmake(Qt5Concurrent) BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5DBus) @@ -59,16 +50,20 @@ BuildRequires: cmake(Qt5Sql) BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) +BuildRequires: pkgconfig(gnutls) >= 2.9.8 +BuildRequires: pkgconfig(gtk+-2.0) >= 2.17.5 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 +Recommends: libgwenhywfar%{libversion} +%if !%{with configure} +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +%endif %if 0%{?fedora} == 15 BuildRequires: fox-devel >= 1.6 %else BuildRequires: fox16-devel %endif -BuildRequires: xorg-x11-fonts -BuildRequires: pkgconfig(gnutls) >= 2.9.8 -BuildRequires: pkgconfig(gtk+-2.0) >= 2.17.5 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 -Recommends: libgwenhywfar%{libversion} %description Gwenhywfar is a base library used to provide OS abstraction functions @@ -79,7 +74,7 @@ communication). %package tools Summary: Multiplatform Helper Library for Other Libraries - Tools -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Libraries Requires: libgwenhywfar%{libversion} = %{version} @@ -92,7 +87,7 @@ communication). %package -n libgwenhywfar%{libversion}-plugins Summary: Multiplatform Helper Library for Other Libraries - Plugins -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries Requires: %{name} = %{version} @@ -105,7 +100,7 @@ communication). %package -n libgwenhywfar%{libversion} Summary: Multiplatform Helper Library for Other Libraries -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries Recommends: %{name}-lang Recommends: libgwenhywfar%{libversion}-plugins = %{version} @@ -119,7 +114,7 @@ communication). %package -n libgwengui-cpp0 Summary: C++ interface for Gwenhywfar -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Libraries %description -n libgwengui-cpp0 @@ -127,7 +122,7 @@ This package contains the C++ GUI interface for Gwenhywfar. %package -n libgwengui-gtk2-0 Summary: Multiplatform Helper Library for Other Libraries -- GTK+ 2 UI Backend -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries %description -n libgwengui-gtk2-0 @@ -141,7 +136,7 @@ This package provides the GTK+ 2 implementation of the generic UI toolkit. %package -n libgwengui-gtk3-0 Summary: Multiplatform Helper Library for Other Libraries -- GTK+ 3 UI Backend -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries %description -n libgwengui-gtk3-0 @@ -153,24 +148,12 @@ communication). This package provides the GTK+ 3 implementation of the generic UI toolkit. -%package -n libgwengui-qt4-0 -Summary: Multiplatform Helper Library for Other Libraries -- Qt4 UI Backend -License: LGPL-2.1+ -Group: System/Libraries - -%description -n libgwengui-qt4-0 -Gwenhywfar is a base library used to provide OS abstraction functions -for Linux, FreeBSD, OpenBSD, NetBSD, and Windows. It also includes -some often needed functions (for example, for handling and parsing of -configuration files, reading and writing of XML files, and interprocess -communication). - -This package provides the Qt4 implementation of the generic UI toolkit. - %package -n libgwengui-qt5-0 Summary: Multiplatform Helper Library for Other Libraries -- Qt5 UI Backend -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries +Provides: libgwengui-qt4-0 = %{version} +Obsoletes: libgwengui-qt4-0 < %{version} %description -n libgwengui-qt5-0 Gwenhywfar is a base library used to provide OS abstraction functions @@ -183,7 +166,7 @@ This package provides the Qt5 implementation of the generic UI toolkit. %package -n libgwengui-fox16-0 Summary: FOX interface for Gwenhywfar -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Libraries %description -n libgwengui-fox16-0 @@ -192,17 +175,14 @@ for Gwenhywfar. %package devel Summary: Multi-Platform Helper Library for Other Libraries -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ Requires: glibc-devel -Requires: libgwenhywfar%{libversion} = %{version} Requires: libgwengui-fox16-0 = %{version} Requires: libgwengui-gtk2-0 = %{version} Requires: libgwengui-gtk3-0 = %{version} -%if %{with qt4} -Requires: libgwengui-qt4-0 = %{version} -%endif Requires: libgwengui-qt5-0 = %{version} +Requires: libgwenhywfar%{libversion} = %{version} %description devel Gwenhywfar is a base library used to provide OS abstraction functions @@ -212,6 +192,7 @@ configuration files, reading/writing of XML files, interprocess communication etc). %lang_package + %prep %setup -q -n %{name}-%{_version} @@ -228,26 +209,21 @@ autoreconf -ifv --enable-full-doc\ --with-docpath=%{_docdir}/%{name}/api \ --disable-static \ -%if %{with qt4} - --with-qt4-libs=%{_libdir} \ - --with-guis="fox16 qt4 qt5 gtk2 gtk3" \ -%else --with-guis="fox16 qt5 gtk2 gtk3" \ -%endif --with-plugins-cfgmgr=all \ --with-pic -%__make %{?smp_mflags} -%__make srcdoc %{?smp_mflags} +%make_jobs +make %{?_smp_mflags} srcdoc %install %make_install %make_install install-srcdoc pushd %{buildroot}%{_docdir}/%{name}/api # we don't want another 'gwenhywfar' dir below docpath - %__mv %{name}/* ./ + mv %{name}/* ./ rm -rf %{name} # remove empty files - `find -maxdepth 1 -type f -empty -print0 | xargs -0 echo %__rm -f` + `find -maxdepth 1 -type f -empty -print0 | xargs -0 echo rm -f` popd find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name} @@ -256,29 +232,20 @@ find %{buildroot} -type f -name "*.la" -delete -print %post -n libgwenhywfar%{libversion} -p /sbin/ldconfig %postun -n libgwenhywfar%{libversion} -p /sbin/ldconfig - %post -n libgwengui-cpp0 -p /sbin/ldconfig %postun -n libgwengui-cpp0 -p /sbin/ldconfig - %post -n libgwengui-gtk2-0 -p /sbin/ldconfig %postun -n libgwengui-gtk2-0 -p /sbin/ldconfig - %post -n libgwengui-gtk3-0 -p /sbin/ldconfig %postun -n libgwengui-gtk3-0 -p /sbin/ldconfig - -%if %{with qt4} -%post -n libgwengui-qt4-0 -p /sbin/ldconfig -%postun -n libgwengui-qt4-0 -p /sbin/ldconfig -%endif - %post -n libgwengui-qt5-0 -p /sbin/ldconfig %postun -n libgwengui-qt5-0 -p /sbin/ldconfig - %post -n libgwengui-fox16-0 -p /sbin/ldconfig %postun -n libgwengui-fox16-0 -p /sbin/ldconfig %files -%doc AUTHORS COPYING NEWS README TODO +%license COPYING +%doc AUTHORS NEWS README TODO %dir %{_datadir}/%{name}/ %{_datadir}/%{name}/ca-bundle.crt %{_datadir}/%{name}/dialogs/ @@ -311,11 +278,6 @@ find %{buildroot} -type f -name "*.la" -delete -print %files -n libgwengui-gtk3-0 %{_libdir}/libgwengui-gtk3.so.* -%if %{with qt4} -%files -n libgwengui-qt4-0 -%{_libdir}/libgwengui-qt4.so.* -%endif - %files -n libgwengui-qt5-0 %{_libdir}/libgwengui-qt5.so.* @@ -332,10 +294,6 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/gwengui-gtk2.pc %{_libdir}/pkgconfig/gwengui-gtk3.pc -%if %{with qt4} -%{_libdir}/pkgconfig/gwengui-qt4.pc -%{_libdir}/cmake/gwengui-qt4-%{devrelease} -%endif %{_libdir}/pkgconfig/gwengui-qt5.pc %{_libdir}/pkgconfig/gwengui-fox16.pc %dir %{_libdir}/cmake From 1337eb6a12d037456e23f45625c7d2aafa3c635e60be84a599277a740c1187f1 Mon Sep 17 00:00:00 2001 From: Michele Bologna Date: Mon, 22 Apr 2019 09:50:31 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Office/gwenhywfar?expand=0&rev=9 --- gwenhywfar.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gwenhywfar.changes b/gwenhywfar.changes index 78e72c8..0c8652e 100644 --- a/gwenhywfar.changes +++ b/gwenhywfar.changes @@ -9,7 +9,7 @@ Wed Jan 30 21:34:35 CET 2019 - sbrabec@suse.com - Update to version 4.99.8 (beta) required by libchipcard-5.1.2: * Generalization in the generic TLV to GWEN DB parser. - * Sspeedup of GWEN_Date_dup (about factor 16). + * Speedup of GWEN_Date_dup (about factor 16). * Correctly read a UTF-8-encoded MT940 file. * Updated Gwengui-Gtk3. * API improvements. From 6b79235d220e15f4158d284a72aebcea31a2ecf86f40cfe7cd60143b7a0fe4ab Mon Sep 17 00:00:00 2001 From: Michele Bologna Date: Tue, 23 Apr 2019 15:45:33 +0000 Subject: [PATCH 4/4] - Fixed typo in changelog file OBS-URL: https://build.opensuse.org/package/show/Office/gwenhywfar?expand=0&rev=10 --- gwenhywfar.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gwenhywfar.changes b/gwenhywfar.changes index 0c8652e..40d6ed1 100644 --- a/gwenhywfar.changes +++ b/gwenhywfar.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 23 15:44:53 UTC 2019 - Michele Bologna + +- Fixed typo in changelog file + ------------------------------------------------------------------- Mon Mar 25 17:48:25 UTC 2019 - Christophe Giboudeaux