- more specific license information

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

diff --git a/glib-networking.spec b/glib-networking.spec
index 782f256d0838bce33a22c8efc19f76f7cb7fb64e..be6972f4b1e19a27c1087893ec4161f1b626cd48 100644 (file)
--- a/glib-networking.spec
+++ b/glib-networking.spec
@@ -1,22 +1,25 @@
+#
+# 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.56.0
+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.56/%{name}-%{version}.tar.xz
-# Source0-md5: f9e720a79014cc7d07eabd02ade0ae4e
+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: gettext-tools >= 0.19.4
 BuildRequires: glib2-devel >= 1:2.55.1
-BuildRequires: gnutls-devel >= 3.3.5
+BuildRequires: gnutls-devel >= 3.4.6
 BuildRequires: gsettings-desktop-schemas-devel
 BuildRequires: libproxy-devel >= 0.3.1
-BuildRequires: libtool >= 2:2.0
-BuildRequires: meson >= 0.43.0
+BuildRequires: meson >= 0.47.0
 BuildRequires: ninja
-BuildRequires: p11-kit-devel >= 0.20
+%{?with_pkcs11:BuildRequires:  p11-kit-devel >= 0.20}
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.727
 BuildRequires: tar >= 1:1.22
@@ -24,10 +27,10 @@ BuildRequires:      xz
 Requires(post,postun): glib2 >= 1:2.55.1
 Requires:      ca-certificates
 Requires:      glib2 >= 1:2.55.1
-Requires:      gnutls >= 3.3.5
-Requires:      gsettings-desktop-schemas
+Requires:      gnutls-libs >= 3.4.6
 Requires:      libproxy >= 0.3.1
-Requires:      p11-kit >= 0.20
+Suggests:      gsettings-desktop-schemas
+%{?with_pkcs11:Requires:       p11-kit >= 0.20}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -46,7 +49,8 @@ implementację GTlsConnection opartą na gnutls.
 %build
 %meson build \
        -Dca_certificates_path=/etc/certs/ca-certificates.crt \
-       -Dinstalled_tests=false
+       -Dinstalled_tests=false \
+       %{?with_pkcs11:-Dpkcs11_support=true}
 
 %meson_build -C build
 
@@ -55,8 +59,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %meson_install -C build
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/installed-tests
-
 %find_lang %{name}
 
 %clean
@@ -72,7 +74,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