[packages/gnome-connections] - updated to 41.0; use included gtk-frtp for now

[qboosh]

commit 9e513b9867dd9c4594e032a93a6396ee110fa840
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 25 21:17:35 2021 +0200

    - updated to 41.0; use included gtk-frtp for now

 gnome-connections.spec | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)
---
diff --git a/gnome-connections.spec b/gnome-connections.spec
index ecb7bc9..0e8bddd 100644
--- a/gnome-connections.spec
+++ b/gnome-connections.spec
@@ -1,25 +1,31 @@
+#
+# Conditional build:
+%bcond_with	system_gtk_frdp	# system gtk-frdp library [3.37.1 tag is too old]
+
 Summary:	Remote desktop client for the GNOME desktop environment
 Summary(pl.UTF-8):	Klient zdalnego pulpitu dla środowiska graficznego GNOME
 Name:		gnome-connections
-Version:	40.0.1
+Version:	41.0
 Release:	1
 License:	GPL v3+
 Group:		X11/Applications/Networking
-Source0:	https://download.gnome.org/sources/gnome-connections/40/%{name}-%{version}.tar.xz
-# Source0-md5:	b59fbc59aa00f87062ffaca21753aa40
+Source0:	https://download.gnome.org/sources/gnome-connections/41/%{name}-%{version}.tar.xz
+# Source0-md5:	910d67b8a9db75084c00489d1b6efa79
 URL:		https://wiki.gnome.org/Apps/Connections
 BuildRequires:	gettext-tools
 BuildRequires:	glib2-devel >= 1:2.50
-BuildRequires:	gtk-frdp-devel >= 0.1
+%{?with_system_gtk_frdp:BuildRequires:	gtk-frdp-devel >= 0.1}
 BuildRequires:	gtk+3-devel >= 3.22
 BuildRequires:	gtk3-vnc-devel >= 0.4.5
+BuildRequires:	libhandy1-devel >= 1.0.0
 BuildRequires:	libxml2-devel >= 1:2.7.8
 BuildRequires:	meson >= 0.50.0
 BuildRequires:	ninja >= 1.5
 BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	vala
-BuildRequires:	vala-gtk-frdp >= 0.1
+%{?with_system_gtk_frdp:BuildRequires:	vala-gtk-frdp >= 0.1}
+BuildRequires:	vala-libhandy1 >= 1.0.0
 BuildRequires:	xz
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	glib2 >= 1:2.50
@@ -43,6 +49,10 @@ zastąpienie Vinagre.
 %prep
 %setup -q
 
+%if %{without system_gtk_frdp}
+%{__sed} -i -e '/dependency.*gtk-frdp-0.1/ s/gtk-frdp-0.1/gtk-frdp-nonexistent/' src/meson.build
+%endif
+
 %build
 %meson build
 
@@ -53,6 +63,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %ninja_install -C build
 
+%if %{without system_gtk_frdp}
+%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/gnome-connections/gtk-frdp
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-connections/pkgconfig/gtk-frdp-0.1.pc
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/gnome-connections/vapi/gtk-frdp-0.1.*
+%endif
+
 %find_lang %{name} --with-gnome
 
 %clean
@@ -74,10 +90,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc NEWS README.md
 %attr(755,root,root) %{_bindir}/gnome-connections
-%{_datadir}/appdata/org.gnome.Connections.appdata.xml
 %{_datadir}/dbus-1/services/org.gnome.Connections.service
 %{_datadir}/glib-2.0/schemas/org.gnome.Connections.gschema.xml
+%{_datadir}/metainfo/org.gnome.Connections.appdata.xml
 %{_datadir}/mime/packages/org.gnome.Connections.xml
 %{_desktopdir}/org.gnome.Connections.desktop
 %{_iconsdir}/hicolor/scalable/apps/org.gnome.Connections.svg
 %{_iconsdir}/hicolor/symbolic/apps/org.gnome.Connections-symbolic.svg
+%if %{without system_gtk_frdp}
+%dir %{_libdir}/gnome-connections
+%attr(755,root,root) %{_libdir}/gnome-connections/libgtk-frdp-0.1.so
+%{_libdir}/gnome-connections/girepository-1.0
+%dir %{_datadir}/gnome-connections
+%{_datadir}/gnome-connections/gir-1.0
+%endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnome-connections.git/commitdiff/9e513b9867dd9c4594e032a93a6396ee110fa840