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