commit b8d4c177feaf2180f884cdfe434374d3b1eca81b
Author: Jakub Bogusz <[email protected]>
Date: Wed Sep 11 15:56:11 2019 +0200
- pkcs11 support is gone (in 2.60); C++11 now required
glib-networking.spec | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/glib-networking.spec b/glib-networking.spec
index 05faa30..357e933 100644
--- a/glib-networking.spec
+++ b/glib-networking.spec
@@ -1,7 +1,3 @@
-#
-# 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
@@ -12,6 +8,7 @@ Group: Libraries
Source0:
http://ftp.gnome.org/pub/GNOME/sources/glib-networking/2.62/%{name}-%{version}.tar.xz
# Source0-md5: 33487436a16f9e79beac1c1a3b55f276
URL: http://www.gnome.org/
+BuildRequires: gcc >= 6:4.7
BuildRequires: gettext-tools >= 0.19.4
BuildRequires: glib2-devel >= 1:2.60.0
BuildRequires: gnutls-devel >= 3.4.6
@@ -19,7 +16,6 @@ BuildRequires: gsettings-desktop-schemas-devel
BuildRequires: libproxy-devel >= 0.3.1
BuildRequires: meson >= 0.50.0
BuildRequires: ninja
-%{?with_pkcs11:BuildRequires: p11-kit-devel >= 0.20}
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.727
BuildRequires: tar >= 1:1.22
@@ -30,7 +26,6 @@ Requires: glib2 >= 1:2.60.0
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
@@ -49,8 +44,7 @@ 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/glib-networking.git/commitdiff/b8d4c177feaf2180f884cdfe434374d3b1eca81b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
