- updated to 0.9.41

- added sh patch (kill bashism in configure)

diff --git a/libmicrohttpd-sh.patch b/libmicrohttpd-sh.patch
new file mode 100644 (file)
index 0000000..964086b
--- /dev/null
+++ b/libmicrohttpd-sh.patch
@@ -0,0 +1,11 @@
+--- 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 0782df34cbe65ebbebc556db13f97cd72b9ce29d..f345f89dff95c95cba0f4d27380fb32f524c9725 100644 (file)
--- a/libmicrohttpd.spec
+++ b/libmicrohttpd.spec
@@ -5,14 +5,15 @@
 Summary:       Embeded HTTP server library
 Summary(pl.UTF-8):     Biblioteka wbudowanego serwera HTTP
 Name:          libmicrohttpd
-Version:       0.9.37
-Release:       2
+Version:       0.9.41
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz
-# Source0-md5: fdf1e0534d83bbf2663f80fa7873be77
+# Source0-md5: 4a9094d6acca69a9da61b170d9dd33ae
 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
@@ -70,6 +71,7 @@ Biblioteka statyczna libmicrohttpd.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -96,7 +98,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/demo
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libmicro*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -123,8 +126,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libmicrohttpd.so
 %attr(755,root,root) %{_libdir}/libmicrospdy.so
-%{_libdir}/libmicrohttpd.la
-%{_libdir}/libmicrospdy.la
 %{_includedir}/microhttpd.h
 %{_includedir}/microspdy.h
 %{_infodir}/libmicrohttpd.info*