From 703e6c02d52a15bb9fc3a3fa0d5758a30d36365e7c02fbd243d95e29fe12b45f Mon Sep 17 00:00:00 2001 From: Yuchen Lin Date: Thu, 25 Apr 2019 14:22:21 +0000 Subject: [PATCH] revert to r63 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gwenhywfar?expand=0&rev=65 --- gwenhywfar-4.20.1.tar.gz | 3 + gwenhywfar-4.99.8beta.tar.gz | 3 - gwenhywfar.changes | 22 ----- gwenhywfar.spec | 157 ++++++++++++++++++++++------------- 4 files changed, 101 insertions(+), 84 deletions(-) create mode 100644 gwenhywfar-4.20.1.tar.gz delete mode 100644 gwenhywfar-4.99.8beta.tar.gz diff --git a/gwenhywfar-4.20.1.tar.gz b/gwenhywfar-4.20.1.tar.gz new file mode 100644 index 0000000..ef04907 --- /dev/null +++ b/gwenhywfar-4.20.1.tar.gz @@ -0,0 +1,3 @@ +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 deleted file mode 100644 index 7cbf405..0000000 --- a/gwenhywfar-4.99.8beta.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8de79f4d63d15737481bc27116a872b031be10d889b00e7d3bf7483db47e35e -size 1625085 diff --git a/gwenhywfar.changes b/gwenhywfar.changes index 40d6ed1..700ba78 100644 --- a/gwenhywfar.changes +++ b/gwenhywfar.changes @@ -1,25 +1,3 @@ -------------------------------------------------------------------- -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 - -- Prepare the KDE4/Qt4 removal from factory. -- Run spec-cleaner - -------------------------------------------------------------------- -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. - * Speedup 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 4d73532..e1dfbcb 100644 --- a/gwenhywfar.spec +++ b/gwenhywfar.spec @@ -1,7 +1,7 @@ # # spec file for package gwenhywfar # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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,24 +12,26 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%define libversion 78 -%define devversion 5 -%define devrelease 4.99 -# Beta does not mean "before release" but a release that is considered as beta: -%define _version %{version}beta +%bcond_without qt4 %bcond_with configure +%define libname libgwenhywfar60 +%define devversion 4.20 Name: gwenhywfar -Version: 4.99.8 +Version: 4.20.1 Release: 0 Summary: Multiplatform helper library for other libraries -License: GPL-2.0-or-later AND LGPL-2.1-or-later +License: GPL-2.0+ and LGPL-2.1+ Group: System/Libraries -URL: https://www.aquamaniac.de/rdm/projects/gwenhywfar -Source: https://github.com/aqbanking/gwenhywfar/archive/%{_version}.tar.gz#/%{name}-%{_version}.tar.gz +Url: http://www.aqbanking.de/ +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 @@ -37,8 +39,12 @@ BuildRequires: graphviz BuildRequires: graphviz-gd BuildRequires: libgcrypt-devel >= 1.2.0 BuildRequires: libopenssl-devel -BuildRequires: pkgconfig -BuildRequires: xorg-x11-fonts +%if %{with qt4} +%if 0%{?suse_version} >= 1500 +#!BuildIgnore: libopenssl-1_0_0-devel +%endif +BuildRequires: libqt4-devel +%endif BuildRequires: cmake(Qt5Concurrent) BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5DBus) @@ -50,20 +56,16 @@ 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: %{libname} %description Gwenhywfar is a base library used to provide OS abstraction functions @@ -74,9 +76,9 @@ communication). %package tools Summary: Multiplatform Helper Library for Other Libraries - Tools -License: GPL-2.0-or-later AND LGPL-2.1-or-later +License: GPL-2.0+ and LGPL-2.1+ Group: System/Libraries -Requires: libgwenhywfar%{libversion} = %{version} +Requires: %{libname} = %{version} %description tools Gwenhywfar is a base library used to provide OS abstraction functions @@ -85,27 +87,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 libgwenhywfar%{libversion}-plugins +%package -n %{libname}-plugins Summary: Multiplatform Helper Library for Other Libraries - Plugins -License: LGPL-2.1-or-later +License: LGPL-2.1+ Group: System/Libraries Requires: %{name} = %{version} -%description -n libgwenhywfar%{libversion}-plugins +%description -n %{libname}-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 libgwenhywfar%{libversion} +%package -n %{libname} Summary: Multiplatform Helper Library for Other Libraries -License: LGPL-2.1-or-later +License: LGPL-2.1+ Group: System/Libraries Recommends: %{name}-lang -Recommends: libgwenhywfar%{libversion}-plugins = %{version} +Recommends: %{libname}-plugins = %{version} -%description -n libgwenhywfar%{libversion} +%description -n %{libname} 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 @@ -114,7 +116,7 @@ communication). %package -n libgwengui-cpp0 Summary: C++ interface for Gwenhywfar -License: GPL-2.0-or-later AND LGPL-2.1-or-later +License: GPL-2.0+ and LGPL-2.1+ Group: System/Libraries %description -n libgwengui-cpp0 @@ -122,7 +124,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-or-later +License: LGPL-2.1+ Group: System/Libraries %description -n libgwengui-gtk2-0 @@ -136,7 +138,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-or-later +License: LGPL-2.1+ Group: System/Libraries %description -n libgwengui-gtk3-0 @@ -148,12 +150,24 @@ 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-or-later +License: LGPL-2.1+ 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 @@ -166,7 +180,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-or-later AND LGPL-2.1-or-later +License: GPL-2.0+ and LGPL-2.1+ Group: System/Libraries %description -n libgwengui-fox16-0 @@ -175,14 +189,17 @@ for Gwenhywfar. %package devel Summary: Multi-Platform Helper Library for Other Libraries -License: LGPL-2.1-or-later +License: LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: glibc-devel +Requires: %{libname} = %{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 @@ -192,9 +209,8 @@ configuration files, reading/writing of XML files, interprocess communication etc). %lang_package - %prep -%setup -q -n %{name}-%{_version} +%setup -q %build export PATH=%{_libqt5_bindir}:$PATH @@ -209,49 +225,63 @@ 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_jobs -make %{?_smp_mflags} srcdoc +%__make %{?smp_mflags} +%__make srcdoc %{?smp_mflags} %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} %fdupes %{buildroot}%{_datadir}/%{name}/apidoc %fdupes %{buildroot}%{_libdir}/cmake -%post -n libgwenhywfar%{libversion} -p /sbin/ldconfig -%postun -n libgwenhywfar%{libversion} -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig +%postun -n %{libname} -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 -%license COPYING -%doc AUTHORS NEWS README TODO +%doc AUTHORS COPYING NEWS README TODO %dir %{_datadir}/%{name}/ %{_datadir}/%{name}/ca-bundle.crt %{_datadir}/%{name}/dialogs/ %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/plugins -%dir %{_libdir}/%{name}/plugins/%{libversion} +%dir %{_libdir}/%{name}/plugins/60 %exclude %{_docdir}/%{name}/api %files tools @@ -263,10 +293,10 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_bindir}/xmlmerge %{_datadir}/%{name}/typemaker2/ -%files -n libgwenhywfar%{libversion}-plugins -%{_libdir}/%{name}/plugins/%{libversion}/* +%files -n %{libname}-plugins +%{_libdir}/%{name}/plugins/60/* -%files -n libgwenhywfar%{libversion} +%files -n %{libname} %{_libdir}/lib%{name}.so.* %files -n libgwengui-cpp0 @@ -278,6 +308,11 @@ 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.* @@ -289,17 +324,21 @@ find %{buildroot} -type f -name "*.la" -delete -print %dir %{_datadir}/aclocal %{_datadir}/aclocal/%{name}.m4 %doc %{_docdir}/%{name}/api/ -%{_includedir}/%{name}%{devversion}/ +%{_includedir}/%{name}4/ %{_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} +%endif %{_libdir}/pkgconfig/gwengui-qt5.pc %{_libdir}/pkgconfig/gwengui-fox16.pc %dir %{_libdir}/cmake -%{_libdir}/cmake/%{name}-%{devrelease} -%{_libdir}/cmake/gwengui-cpp-%{devrelease} -%{_libdir}/cmake/gwengui-qt5-%{devrelease} +%{_libdir}/cmake/%{name}-%{devversion} +%{_libdir}/cmake/gwengui-cpp-%{devversion} +%{_libdir}/cmake/gwengui-qt5-%{devversion} %files lang -f %{name}.lang