diff --git a/libmicrohttpd.changes b/libmicrohttpd.changes index ad1b270..719864c 100644 --- a/libmicrohttpd.changes +++ b/libmicrohttpd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Nov 13 14:01:04 UTC 2015 - mpluskal@suse.com + +- Enable http2/spdy +- Don't build examples as we don't ship them anyway +- Disable tests as linking fails for them with spdy enabled + ------------------------------------------------------------------- Tue Nov 10 14:23:58 UTC 2015 - mpluskal@suse.com diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index 6f77e4b..858ec7d 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -17,14 +17,15 @@ # -%if 0%{?suse_version} > 1310 -# libmicrosdpy requires openssl >= 1.0.1 -# and spdylay -%define enable_libmicrospdy 0 -%endif - %global libmicrohttpd libmicrohttpd12 %global libmicrospdy libmicrospdy0 + +%if 0%{?suse_version} > 1310 && !0%{?sles_version} +# libmicrosdpy requires openssl >= 1.0.1 +# and spdylay +%define enable_libmicrospdy 1 +%endif + Name: libmicrohttpd Version: 0.9.46 Release: 0 @@ -46,6 +47,9 @@ BuildRequires: libtool BuildRequires: openssl-devel BuildRequires: pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?enable_libmicrospdy} +BuildRequires: spdylay-devel +%endif %description GNU libmicrohttpd is a small C library that is supposed to make it easy to run @@ -133,18 +137,20 @@ localhost. %build %configure \ - --enable-bauth --enable-dauth \ - --enable-epoll \ - --enable-messages \ + --enable-bauth \ + --enable-dauth \ + --enable-epoll \ + --enable-messages \ --enable-postprocessor \ - --enable-https \ - --disable-static \ + --enable-https \ + --disable-static \ + --disable-examples \ %if 0%{?enable_libmicrospdy} - --enable-spdy \ + --enable-spdy \ %else - --disable-spdy \ + --disable-spdy \ %endif - --enable-curl + --enable-curl make %{?_smp_mflags} %install @@ -152,7 +158,8 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} find %{buildroot} -type f -name "*.la" -delete -print %check -make -j1 check +# linking fails with spdy enabled +#make -j1 check %post -n %{libmicrohttpd} -p /sbin/ldconfig