From 74d5e483727860be0c1bcc52592c8ed45b8d4e9f Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 23 Sep 2014 14:51:26 +0100 Subject: [PATCH] update to 0.30.1; switch to OpenSSL --- neon.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/neon.spec b/neon.spec index e4c6a5d..403d32c 100644 --- a/neon.spec +++ b/neon.spec @@ -8,7 +8,7 @@ URL: http://www.webdav.org/neon/ Source0: http://www.webdav.org/neon/neon-%{version}.tar.gz Patch0: neon-0.27.0-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: expat-devel, gnutls-devel, zlib-devel, krb5-devel, libproxy-devel +BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel, libproxy-devel BuildRequires: pkgconfig, pakchois-devel Requires: ca-certificates @@ -22,7 +22,7 @@ Kerberos authentication, and has complete SSL support. %package devel Summary: Development libraries and C header files for the neon library Group: Development/Libraries -Requires: neon = %{version}-%{release}, gnutls-devel, zlib-devel, expat-devel +Requires: neon = %{version}-%{release}, openssl-devel, zlib-devel, expat-devel Requires: pkgconfig # Documentation is GPLv2+ License: LGPLv2+ and GPLv2+ @@ -39,11 +39,9 @@ sed -ibak '/^install-docs/s/install-html//' Makefile.in %build export CC="%{__cc} -pthread" -# Use standard system CA bundle: -%define cabundle %{_sysconfdir}/pki/tls/certs/ca-bundle.crt %configure --with-expat --enable-shared --disable-static \ - --enable-warnings --with-ca-bundle=%{cabundle} \ - --with-ssl=gnutls --enable-threadsafe-ssl=posix \ + --enable-warnings \ + --with-ssl=openssl --enable-threadsafe-ssl=posix \ --with-libproxy make %{?_smp_mflags} @@ -80,7 +78,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Tue Sep 23 2014 Joe Orton - 0.30.1-1 -- update to 0.30.1 +- update to 0.30.1; switch to OpenSSL * Sun Aug 17 2014 Fedora Release Engineering - 0.30.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild