Accepting request 595804 from home:luc14n0:branches:Office

Update to version 4.20.0.

OBS-URL: https://build.opensuse.org/request/show/595804
OBS-URL: https://build.opensuse.org/package/show/Office/gwenhywfar?expand=0&rev=5

gwenhywfar-4.18.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6915bba42d8b7f0213cee186a944296e5e5e97cdbde5b539a924261af03086ca
-size 2333059

gwenhywfar-4.20.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a88daabba1388f9528590aab5de527a12dd44a7da4572ce48469a29911b0fb0
+size 2379537

gwenhywfar.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Thu Apr  5 01:14:17 UTC 2018 - luc14n0@linuxmail.org
+
+- Update to version 4.20.0:
+  + Add a Gtk3 frontend.
+- Add:
+  + pkgconfig(gtk+-3.0) BuildRequires and libgwengui-gtk3
+    subpackage following upstream changes.
+  + Conditionalized autoconf, automake and libtool BuildRequires
+    along with autoreconf call to ease the switching between
+    tarballs with or without configure script.
+  + Missing ldconfig post/postun scriptlets for libgwengui-qt5.
+- Drop standard BuilRoot tag definition: RPM already handles this
+  itself.
+- Delete redundant deprecated clean section.
+- Switch gnutls and gtk2 devel packages BuildRequires with their
+  respectives pkgconfig modules counterparts.
+
 -------------------------------------------------------------------
 Mon Dec 11 13:02:15 UTC 2017 - wbauer@tmo.at
 

gwenhywfar.spec

@@ -16,21 +16,27 @@
 #
 
 %bcond_without qt4
-
+%bcond_with configure
-%define	libversion	60
+%define	libname libgwenhywfar60
-%define devversion 4.18
+%define devversion 4.20
 Name:           gwenhywfar
-Version:        4.18.0
+Version:        4.20.0
 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:         %{name}-%{version}.tar.gz
+%if !%{with configure}
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
+%endif
 BuildRequires:  doxygen
 BuildRequires:  fdupes
-BuildRequires:  gnutls-devel >= 3.0
+# For doc graphs
-BuildRequires:  gtk2-devel >= 1.4
+BuildRequires:  graphviz
+BuildRequires:  graphviz-gd
 BuildRequires:  libgcrypt-devel >= 1.2.0
 BuildRequires:  libopenssl-devel
 %if %{with qt4}
@@ -55,12 +61,11 @@ BuildRequires:  fox-devel >= 1.6
 %else
 BuildRequires:  fox16-devel
 %endif
-# For doc graphs
-BuildRequires:  graphviz
-BuildRequires:  graphviz-gd
 BuildRequires:  xorg-x11-fonts
-Recommends:     lib%{name}%{libversion}
+BuildRequires:  pkgconfig(gnutls) >= 2.9.8
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+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
@@ -73,7 +78,7 @@ communication).
 Summary:        Multiplatform Helper Library for Other Libraries - Tools
 License:        GPL-2.0+ and LGPL-2.1+
 Group:          System/Libraries
-Requires:       lib%{name}%{libversion} = %{version}
+Requires:       %{libname} = %{version}
 
 %description tools
 Gwenhywfar is a base library used to provide OS abstraction functions
@@ -82,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 lib%{name}%{libversion}-plugins
+%package -n %{libname}-plugins
 Summary:        Multiplatform Helper Library for Other Libraries - Plugins
 License:        LGPL-2.1+
 Group:          System/Libraries
 Requires:       %{name} = %{version}
 
-%description -n lib%{name}%{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 lib%{name}%{libversion}
+%package -n %{libname}
 Summary:        Multiplatform Helper Library for Other Libraries
 License:        LGPL-2.1+
 Group:          System/Libraries
 Recommends:     %{name}-lang
-Recommends:     lib%{name}%{libversion}-plugins = %{version}
+Recommends:     %{libname}-plugins = %{version}
 
-%description -n lib%{name}%{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
@@ -118,7 +123,7 @@ Group:          System/Libraries
 This package contains the C++ GUI interface for Gwenhywfar.
 
 %package -n libgwengui-gtk2-0
-Summary:        Multiplatform Helper Library for Other Libraries -- GTK+ UI Backend
+Summary:        Multiplatform Helper Library for Other Libraries -- GTK+ 2 UI Backend
 License:        LGPL-2.1+
 Group:          System/Libraries
 
@@ -129,7 +134,21 @@ 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 GTK+ implementation of the generic UI toolkit.
+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+
+Group:          System/Libraries
+
+%description -n libgwengui-gtk3-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 GTK+ 3 implementation of the generic UI toolkit.
 
 %package -n libgwengui-qt4-0
 Summary:        Multiplatform Helper Library for Other Libraries -- Qt4 UI Backend
@@ -173,9 +192,10 @@ Summary:        Multi-Platform Helper Library for Other Libraries
 License:        LGPL-2.1+
 Group:          Development/Libraries/C and C++
 Requires:       glibc-devel
-Requires:       lib%{name}%{libversion} = %{version}
+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
@@ -197,6 +217,9 @@ export PATH=%{_libqt5_bindir}:$PATH
 # quick fix for $CPP being unset and configure failing to handle include dirs properly
 CPP=`which cpp`
 export CPP
+%if !%{with configure}
+autoreconf -ifv
+%endif
 %configure\
 	--enable-release\
 	--enable-full-doc\
@@ -204,9 +227,9 @@ export CPP
 	--disable-static \
 %if %{with qt4}
 	--with-qt4-libs=%{_libdir} \
-	--with-guis="fox16 qt4 qt5 gtk2" \
+	--with-guis="fox16 qt4 qt5 gtk2 gtk3" \
 %else
-	--with-guis="fox16 qt5 gtk2" \
+	--with-guis="fox16 qt5 gtk2 gtk3" \
 %endif
 	--with-plugins-cfgmgr=all \
 	--with-pic
@@ -214,8 +237,8 @@ export CPP
 %__make srcdoc %{?smp_mflags}
 
 %install
-%makeinstall
+%make_install
-%makeinstall install-srcdoc
+%make_install install-srcdoc
 pushd %{buildroot}%{_docdir}/%{name}/api
     # we don't want another 'gwenhywfar' dir below docpath
     %__mv %{name}/* ./
@@ -226,45 +249,42 @@ popd
 find %{buildroot} -type f -name "*.la" -delete -print
 %find_lang %{name}
 %fdupes %{buildroot}%{_datadir}/%{name}/apidoc
+%fdupes %{buildroot}%{_libdir}/cmake
 
-%clean
+%post   -n %{libname} -p /sbin/ldconfig
-rm -rf %{buildroot}
+%postun -n %{libname} -p /sbin/ldconfig
-
-%post -n lib%{name}%{libversion} -p /sbin/ldconfig
-
-%postun -n lib%{name}%{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-fox16-0 -p /sbin/ldconfig
+%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
-%defattr (-,root,root)
 %doc AUTHORS COPYING ChangeLog 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
-%defattr (-, root, root)
 %{_bindir}/gct-tool
 %{_bindir}/gsa
 %{_bindir}/mklistdoc
@@ -273,38 +293,33 @@ rm -rf %{buildroot}
 %{_bindir}/xmlmerge
 %{_datadir}/%{name}/typemaker2/
 
-%files -n lib%{name}%{libversion}-plugins
+%files -n %{libname}-plugins
-%defattr (-, root, root)
+%{_libdir}/%{name}/plugins/60/*
-%{_libdir}/%{name}/plugins/%{libversion}/*
 
-%files -n lib%{name}%{libversion}
+%files -n %{libname}
-%defattr (-,root,root)
 %{_libdir}/lib%{name}.so.*
 
 %files -n libgwengui-cpp0
-%defattr (-,root,root)
 %{_libdir}/libgwengui-cpp.so.*
 
 %files -n libgwengui-gtk2-0
-%defattr (-, root, root)
 %{_libdir}/libgwengui-gtk2.so.*
 
+%files -n libgwengui-gtk3-0
+%{_libdir}/libgwengui-gtk3.so.*
+
 %if %{with qt4}
 %files -n libgwengui-qt4-0
-%defattr (-, root, root)
 %{_libdir}/libgwengui-qt4.so.*
 %endif
 
 %files -n libgwengui-qt5-0
-%defattr (-, root, root)
 %{_libdir}/libgwengui-qt5.so.*
 
 %files -n libgwengui-fox16-0
-%defattr (-,root,root)
 %{_libdir}/libgwengui-fox16.so.*
 
 %files devel
-%defattr (-, root, root)
 %{_bindir}/%{name}-config
 %dir %{_datadir}/aclocal
 %{_datadir}/aclocal/%{name}.m4
@@ -313,6 +328,7 @@ rm -rf %{buildroot}
 %{_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}