- more specific license information

[packages/glib-networking.git] / glib-networking.spec

diff --git a/glib-networking.spec b/glib-networking.spec
index e54848579d9bba7232ee16862ffbccadde377e35..be6972f4b1e19a27c1087893ec4161f1b626cd48 100644 (file)
--- a/glib-networking.spec
+++ b/glib-networking.spec
@@ -1,27 +1,36 @@
+#
+# 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.30.1
+Version:       2.60.1
 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.30/%{name}-%{version}.tar.xz
-# Source0-md5: a93b7344daf6292ea66f7a6ec21f361d
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib-networking/2.60/%{name}-%{version}.tar.xz
+# Source0-md5: 83321ffc3c336894b8a5bc18db3fe58d
 URL:           http://www.gnome.org/
-BuildRequires: autoconf >= 2.65
-BuildRequires: automake
-BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.29.18
-BuildRequires: gnutls-devel >= 2.1.7
+BuildRequires: gettext-tools >= 0.19.4
+BuildRequires: glib2-devel >= 1:2.55.1
+BuildRequires: gnutls-devel >= 3.4.6
 BuildRequires: gsettings-desktop-schemas-devel
-BuildRequires: intltool >= 0.40.0
-BuildRequires: libgcrypt-devel >= 1.2.0
 BuildRequires: libproxy-devel >= 0.3.1
-BuildRequires: libtool >= 2:2.0
+BuildRequires: meson >= 0.47.0
+BuildRequires: ninja
+%{?with_pkcs11:BuildRequires:  p11-kit-devel >= 0.20}
 BuildRequires: pkgconfig
-Requires(post,postun): glib2 >= 1:2.29.18
+BuildRequires: rpmbuild(macros) >= 1.727
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+Requires(post,postun): glib2 >= 1:2.55.1
 Requires:      ca-certificates
+Requires:      glib2 >= 1:2.55.1
+Requires:      gnutls-libs >= 3.4.6
 Requires:      libproxy >= 0.3.1
+Suggests:      gsettings-desktop-schemas
+%{?with_pkcs11:Requires:       p11-kit >= 0.20}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,24 +47,17 @@ 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 \
+       %{?with_pkcs11:-Dpkcs11_support=true}
+
+%meson_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.la
+%meson_install -C build
 
 %find_lang %{name}
 
@@ -72,9 +74,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