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

diff --git a/glib-networking.spec b/glib-networking.spec
index c98a09c..585aac6 100644
--- a/glib-networking.spec
+++ b/glib-networking.spec
@@ -1,33 +1,31 @@
 Summary:	Networking support for GLib
 Summary(pl.UTF-8):	Obsługa sieci dla GLiba
 Name:		glib-networking
-Version:	2.44.0
+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.44/%{name}-%{version}.tar.xz
-# Source0-md5:	6989b20cf3b26dd5ae272e04a9acb0b3
-URL:		http://www.gnome.org/
-BuildRequires:	autoconf >= 2.65
-BuildRequires:	automake >= 1:1.11
-BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.42.0
-BuildRequires:	gnutls-devel >= 3.0
+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.67.0
+BuildRequires:	gnutls-devel >= 3.7
 BuildRequires:	gsettings-desktop-schemas-devel
-BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libproxy-devel >= 0.3.1
-BuildRequires:	libtool >= 2:2.0
-BuildRequires:	p11-kit-devel >= 0.8
+BuildRequires:	meson >= 0.50.0
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
-Requires(post,postun):	glib2 >= 1:2.42.0
+Requires(post,postun):	glib2 >= 1:2.67.0
 Requires:	ca-certificates
-Requires:	glib2 >= 1:2.42.0
-Requires:	gnutls >= 3.0
-Requires:	gsettings-desktop-schemas
+Requires:	glib2 >= 1:2.67.0
+Requires:	gnutls-libs >= 3.7
 Requires:	libproxy >= 0.3.1
-Requires:	p11-kit >= 0.8
+Suggests:	gsettings-desktop-schemas
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -44,24 +42,16 @@ implementację GTlsConnection opartą na gnutls.
 %setup -q
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--disable-silent-rules \
-	--disable-static \
-	--with-ca-certificates=/etc/certs/ca-certificates.crt
-%{__make}
+%meson build \
+	-Dca_certificates_path=/etc/certs/ca-certificates.crt \
+	-Dinstalled_tests=false
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.la
+%ninja_install -C build
 
 %find_lang %{name}
 
@@ -78,9 +68,10 @@ umask 022
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_libdir}/glib-pacrunner
+%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
 %attr(755,root,root) %{_libdir}/gio/modules/libgiognomeproxy.so
 %{_datadir}/dbus-1/services/org.gtk.GLib.PACRunner.service
+%{systemduserunitdir}/glib-pacrunner.service