From 58772c3a5d306a4d830c89d84d188d6eac9b201d3fc1dd23ebc5fae190d3afc8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 4 May 2016 06:17:29 +0000 Subject: [PATCH] Accepting request 391813 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/391813 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnutls?expand=0&rev=91 --- gnutls.changes | 6 ++++++ gnutls.spec | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/gnutls.changes b/gnutls.changes index bb857a7..96ca9a7 100644 --- a/gnutls.changes +++ b/gnutls.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Apr 23 16:58:53 UTC 2016 - sleep_walker@opensuse.org + +- enabled guile support +- removed duplicates + ------------------------------------------------------------------- Mon Apr 11 09:18:26 UTC 2016 - meissner@suse.com diff --git a/gnutls.spec b/gnutls.spec index 8c8ff8d..4463a73 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -27,6 +27,7 @@ %define gnutls_dane_sover 0 %endif %bcond_with tpm +%bcond_without guile Name: gnutls Version: 3.4.11 @@ -43,6 +44,7 @@ Source3: baselibs.conf BuildRequires: autogen BuildRequires: automake +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libidn-devel BuildRequires: libnettle-devel >= 3.1 @@ -55,6 +57,9 @@ BuildRequires: trousers-devel BuildRequires: libunbound-devel Requires: libgnutls-dane%{gnutls_dane_sover} = %{version} %endif +%if %{with guile} +BuildRequires: guile-devel +%endif # disabled ppc - valgrind crashes on email cert tests currently. Marcus 20150413 # disabled armv7l - valgrind appears to mishandle some insns # disabled aarch64 - valgrind mishandles exclusive load/store causing deadlocks @@ -170,6 +175,16 @@ Requires: libgnutls-openssl%{gnutls_ossl_sover} = %{version} %description -n libgnutls-openssl-devel Files needed for software development using gnutls. +%if %{with guile} +%package guile +Summary: Guile wrappers for gnutls +License: LGPL-2.1+ +Group: Development/Libraries/Other +Requires: guile + +%description guile +GnuTLS Wrappers for GNU Guile - dialect of scheme. +%endif %prep %setup -q @@ -189,6 +204,7 @@ autoreconf -if --disable-silent-rules \ --with-default-trust-store-dir=/var/lib/ca-certificates/pem \ --with-sysroot=/%{?_sysroot} \ + --with-guile-site-dir=no \ %if %{without tpm} --without-tpm \ %endif @@ -217,6 +233,11 @@ rm -f %{buildroot}%{_libdir}/*.la %__mkdir -p %{buildroot}%{_docdir}/libgnutls-devel/examples %__cp doc/examples/*.{c,h} %{buildroot}%{_docdir}/libgnutls-devel/examples/ +# PNG files are replaced with the compressed files and that breaks +# deduplication, this is workaround +find %{buildroot}%{_datadir} -name '*.png' -exec gzip -9 {} + +%fdupes -s %{buildroot}%{_datadir} + %find_lang libgnutls --all-name %check @@ -338,4 +359,11 @@ rm -f %{buildroot}%{_libdir}/*.la %dir %{_includedir}/%{name} %{_includedir}/%{name}/openssl.h +%if %{with guile} +%files guile +%defattr(-, root, root) +%{_libdir}/guile/* +%{_datadir}/guile/site/gnutls* +%endif + %changelog