X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=NetworkManager-openvpn.spec;h=bbd98843eb4d1563b209f9617924898beb041ac4;hb=refs%2Fheads%2Fmaster;hp=a84ce7b3aeb12a666db6d39e53960af200ef503a;hpb=b8684a31bbd519ee4c924c53b0b8d9643ff82d28;p=packages%2FNetworkManager-openvpn.git

diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec
index a84ce7b..bbd9884 100644
--- a/NetworkManager-openvpn.spec
+++ b/NetworkManager-openvpn.spec
@@ -1,22 +1,27 @@
+#
+# Conditional build:
+%bcond_without	gtk4	# Gtk4 version of editor plugin (GNOME 42+)
+
 Summary:	NetworkManager VPN integration for OpenVPN
 Summary(pl.UTF-8):	Integracja NetworkManagera z OpenVPN-em
 Name:		NetworkManager-openvpn
-Version:	1.8.12
+Version:	1.10.2
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/1.8/%{name}-%{version}.tar.xz
-# Source0-md5:	e8b1210011ece18d0278310fbff45af5
+Source0:	https://download.gnome.org/sources/NetworkManager-openvpn/1.10/%{name}-%{version}.tar.xz
+# Source0-md5:	3a7cb5ac3d33bd8b22dc9f4b58216b5b
 Patch0:		chroot.patch
 URL:		https://wiki.gnome.org/Projects/NetworkManager
 BuildRequires:	NetworkManager-devel >= 2:1.7.0
-BuildRequires:	NetworkManager-gtk-lib-devel >= 1.7.0
+BuildRequires:	NetworkManager-gtk-lib-devel >= 1.8.0
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake >= 1:1.9
-BuildRequires:	gettext-tools
-BuildRequires:	glib2-devel >= 1:2.32
+BuildRequires:	gettext-tools >= 0.19
+BuildRequires:	glib2-devel >= 1:2.34
 BuildRequires:	gtk+3-devel >= 3.4
-BuildRequires:	intltool >= 0.36.2
+%{?with_gtk4:BuildRequires:	gtk4-devel >= 4.0}
+%{?with_gtk4:BuildRequires:	libnma-gtk4-devel >= 1.8.33}
 BuildRequires:	libsecret-devel >= 0.18
 BuildRequires:	libtool >= 2:2
 BuildRequires:	pkgconfig
@@ -31,7 +36,7 @@ Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires:	NetworkManager >= 2:1.7.0
 Requires:	NetworkManager-gtk-lib >= 1.7.0
-Requires:	glib2 >= 1:2.32
+Requires:	glib2 >= 1:2.34
 Requires:	gtk+3 >= 3.4
 Requires:	libsecret >= 0.18
 Requires:	openvpn
@@ -48,7 +53,6 @@ Integracja NetworkManagera z OpenVPN-em.
 %patch0 -p1
 
 %build
-%{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
@@ -56,7 +60,8 @@ Integracja NetworkManagera z OpenVPN-em.
 %{__automake}
 %configure \
 	--disable-silent-rules \
-	--disable-static
+	--disable-static \
+	%{?with_gtk4:--with-gtk4}
 
 %{__make}
 
@@ -85,12 +90,15 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README
+%doc AUTHORS NEWS README
 %attr(755,root,root) %{_libdir}/NetworkManager/libnm-vpn-plugin-openvpn.so
 %attr(755,root,root) %{_libdir}/NetworkManager/libnm-vpn-plugin-openvpn-editor.so
+%if %{with gtk4}
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-gtk4-vpn-plugin-openvpn-editor.so
+%endif
 %attr(755,root,root) %{_libexecdir}/nm-openvpn-auth-dialog
 %attr(755,root,root) %{_libexecdir}/nm-openvpn-service
 %attr(755,root,root) %{_libexecdir}/nm-openvpn-service-openvpn-helper
 %{_prefix}/lib/NetworkManager/VPN/nm-openvpn-service.name
-%{_datadir}/appdata/network-manager-openvpn.metainfo.xml
 %{_datadir}/dbus-1/system.d/nm-openvpn-service.conf
+%{_datadir}/metainfo/network-manager-openvpn.metainfo.xml