[packages/libmicrohttpd] - updated to 0.9.41 - added sh patch (kill bashism in configure)

qboosh qboosh at pld-linux.org
Sat May 9 08:43:13 CEST 2015


commit 337f22213ffe1d8a636a994c25a2b41c7e32a71c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat May 9 08:44:33 2015 +0200

    - updated to 0.9.41
    - added sh patch (kill bashism in configure)

 libmicrohttpd-sh.patch | 11 +++++++++++
 libmicrohttpd.spec     | 13 +++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec
index 0782df3..f345f89 100644
--- 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*
diff --git a/libmicrohttpd-sh.patch b/libmicrohttpd-sh.patch
new file mode 100644
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=''
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libmicrohttpd.git/commitdiff/337f22213ffe1d8a636a994c25a2b41c7e32a71c



More information about the pld-cvs-commit mailing list