X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=glib-networking.spec;h=585aac6ccd8dfa1e4aa6805e31c447e1f59bec6f;hb=30c42e5;hp=e33d251878ae1a0baafae39e4161aaa7de4888eb;hpb=9a299917b44a95c0bf5f385a01910c6132b801b0;p=packages%2Fglib-networking.git

diff --git a/glib-networking.spec b/glib-networking.spec
index e33d251..585aac6 100644
--- a/glib-networking.spec
+++ b/glib-networking.spec
@@ -1,36 +1,31 @@
-#
-# Conditional build:
-%bcond_with	pkcs11	# PKCS#11 support using p11-kit
-
 Summary:	Networking support for GLib
 Summary(pl.UTF-8):	Obsługa sieci dla GLiba
 Name:		glib-networking
-Version:	2.60.0.1
+Version:	2.68.2
 Release:	1
-License:	LGPL v2
+License:	LGPL v2.1+ with OpenSSL exception
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/glib-networking/2.60/%{name}-%{version}.tar.xz
-# Source0-md5:	b41b94a3f84e63437760fe49774431bb
-URL:		http://www.gnome.org/
+Source0:	https://download.gnome.org/sources/glib-networking/2.68/%{name}-%{version}.tar.xz
+# Source0-md5:	5c3b020db7d0937f75aac7654c38343f
+URL:		https://www.gnome.org/
+BuildRequires:	gcc >= 6:4.7
 BuildRequires:	gettext-tools >= 0.19.4
-BuildRequires:	glib2-devel >= 1:2.55.1
-BuildRequires:	gnutls-devel >= 3.4.6
+BuildRequires:	glib2-devel >= 1:2.67.0
+BuildRequires:	gnutls-devel >= 3.7
 BuildRequires:	gsettings-desktop-schemas-devel
 BuildRequires:	libproxy-devel >= 0.3.1
-BuildRequires:	meson >= 0.47.0
-BuildRequires:	ninja
-%{?with_pkcs11:BuildRequires:	p11-kit-devel >= 0.20}
+BuildRequires:	meson >= 0.50.0
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.727
+BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
-Requires(post,postun):	glib2 >= 1:2.55.1
+Requires(post,postun):	glib2 >= 1:2.67.0
 Requires:	ca-certificates
-Requires:	glib2 >= 1:2.55.1
-Requires:	gnutls-libs >= 3.4.6
-Requires:	gsettings-desktop-schemas
+Requires:	glib2 >= 1:2.67.0
+Requires:	gnutls-libs >= 3.7
 Requires:	libproxy >= 0.3.1
-%{?with_pkcs11:Requires:	p11-kit >= 0.20}
+Suggests:	gsettings-desktop-schemas
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -49,15 +44,14 @@ implementację GTlsConnection opartą na gnutls.
 %build
 %meson build \
 	-Dca_certificates_path=/etc/certs/ca-certificates.crt \
-	-Dinstalled_tests=false \
-	%{?with_pkcs11:-Dpkcs11_support=true}
+	-Dinstalled_tests=false
 
-%meson_build -C build
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%meson_install -C build
+%ninja_install -C build
 
 %find_lang %{name}
 
@@ -74,7 +68,7 @@ umask 022
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc NEWS README
+%doc LICENSE_EXCEPTION NEWS README
 %attr(755,root,root) %{_libexecdir}/glib-pacrunner
 %attr(755,root,root) %{_libdir}/gio/modules/libgiognutls.so
 %attr(755,root,root) %{_libdir}/gio/modules/libgiolibproxy.so