- updated to 0.9.51

- removed obsolete link,sha patches
- SPDY has been withdrawn, microspdy is gone

diff --git a/libmicrohttpd-link.patch b/libmicrohttpd-link.patch
deleted file mode 100644 (file)
index 9bb3b98..0000000
--- a/libmicrohttpd-link.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libmicrohttpd-0.9.28/src/microspdy/Makefile.am.orig        2013-07-08 11:49:30.000000000 +0200
-+++ libmicrohttpd-0.9.28/src/microspdy/Makefile.am     2013-07-19 20:49:27.404186627 +0200
-@@ -28,6 +28,7 @@
-   alstructures.c alstructures.h 
- 
- 
-+libmicrospdy_la_LIBADD = -lssl -lcrypto -lz
- libmicrospdy_la_LDFLAGS = \
-   $(SPDY_LIB_LDFLAGS) 
- 
---- libmicrohttpd-0.9.44/src/examples/mhd2spdy_spdy.c.orig     2015-10-30 22:10:36.420093201 +0100
-+++ libmicrohttpd-0.9.44/src/examples/mhd2spdy_spdy.c  2015-10-30 22:15:31.610087152 +0100
-@@ -31,6 +31,7 @@
-  * @author Andrey Uzunov
-  */
- 
-+#include "platform_interface.h"
- #include "mhd2spdy_structures.h"
- #include "mhd2spdy_spdy.h"
- #include "mhd2spdy_http.h"

diff --git a/libmicrohttpd-sh.patch b/libmicrohttpd-sh.patch
deleted file mode 100644 (file)
index 964086b..0000000
--- a/libmicrohttpd-sh.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmicrohttpd-0.9.41/configure.ac.orig     2015-04-29 11:33:15.000000000 +0200
-+++ libmicrohttpd-0.9.41/configure.ac  2015-05-09 07:21:31.291508981 +0200
-@@ -837,7 +837,7 @@
- AS_IF([[test "x$enable_https" = "xyes" && test "x$have_gnutls_pkgcfg" = "xyes" ]],
-  [ # remove GnuTLS from private libs in .pc file as it defined in Requires.private
-    MHD_REQ_PRIVATE='gnutls'
--   MHD_LIBDEPS_PKGCFG="${MHD_LIBDEPS//$GNUTLS_LIBS/}"
-+   MHD_LIBDEPS_PKGCFG="$(echo "$MHD_LIBDEPS" | sed -e "s/$GNUTLS_LIBS//")"
-  ],
-  [
-    MHD_REQ_PRIVATE=''

diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec
index daeb3468dccd1e977c8e240d3f719e2b566d657d..6709923a0a86337d6e58dca116e0954d7afc89de 100644 (file)
--- a/libmicrohttpd.spec
+++ b/libmicrohttpd.spec
@@ -5,15 +5,13 @@
 Summary:       Embeded HTTP server library
 Summary(pl.UTF-8):     Biblioteka wbudowanego serwera HTTP
 Name:          libmicrohttpd
-Version:       0.9.46
+Version:       0.9.51
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz
-# Source0-md5: 63199cd16a5b9367e5a4fc6013ca0a5d
+# Source0-md5: 452f6a4cef08f23f88915b86bde4d9d6
 Patch0:                %{name}-info.patch
-Patch1:                %{name}-link.patch
-Patch2:                %{name}-sh.patch
 URL:           http://www.gnu.org/software/libmicrohttpd/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.10
@@ -21,12 +19,9 @@ BuildRequires:       gnutls-devel >= 2.8.6
 BuildRequires: libgcrypt-devel >= 1.2.4
 BuildRequires: libmagic-devel
 BuildRequires: libtool >= 2:2.4.0
-# for microspdy
-BuildRequires: openssl-devel >= 0.9.8
 BuildRequires: texinfo
 %if %{with tests}
 BuildRequires: curl-devel >= 7.16.4
-BuildRequires: spdylay-devel
 %endif
 Requires:      gnutls >= 2.8.6
 Requires:      libgcrypt >= 1.2.4
@@ -70,8 +65,6 @@ Biblioteka statyczna libmicrohttpd.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -116,25 +109,18 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/microspdy2http
 %attr(755,root,root) %{_libdir}/libmicrohttpd.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libmicrohttpd.so.12
-%attr(755,root,root) %{_libdir}/libmicrospdy.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmicrospdy.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libmicrohttpd.so
-%attr(755,root,root) %{_libdir}/libmicrospdy.so
 %{_includedir}/microhttpd.h
-%{_includedir}/microspdy.h
 %{_infodir}/libmicrohttpd.info*
 %{_infodir}/libmicrohttpd-tutorial.info*
 %{_mandir}/man3/libmicrohttpd.3*
 %{_pkgconfigdir}/libmicrohttpd.pc
-%{_pkgconfigdir}/libmicrospdy.pc
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libmicrohttpd.a
-%{_libdir}/libmicrospdy.a