[libmicrohttpd/el5/master: 26/27] Merge branch 'master' into el5
Tim Niemueller
timn at fedoraproject.org
Mon Jan 24 23:59:30 UTC 2011
commit e180941f42e67ed0171a96b9a519b2beaaeef772
Merge: d4fbdd8 80b8b2a
Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date: Tue Jan 25 00:58:25 2011 +0100
Merge branch 'master' into el5
Conflicts:
.gitignore
libmicrohttpd.spec
sources
.gitignore | 5 ++-
libmicrohttpd-0.9.5-fix-basic-auth.patch | 19 +++++++++
libmicrohttpd-0.9.5-no-abort.patch | 12 +++++
libmicrohttpd.spec | 65 +++++++++++++++++++++--------
sources | 2 +-
5 files changed, 83 insertions(+), 20 deletions(-)
---
diff --cc libmicrohttpd.spec
index 5aa8f7a,59559a1..22a7c88
--- a/libmicrohttpd.spec
+++ b/libmicrohttpd.spec
@@@ -7,15 -7,15 +7,21 @@@ License: LGPLv2
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
URL: http://www.gnu.org/software/libmicrohttpd/
Source0: ftp://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz
+
+ Patch0: %{name}-0.9.5-no-abort.patch
+ Patch1: %{name}-0.9.5-fix-basic-auth.patch
+
+ BuildRequires: autoconf, automake, libtool
-BuildRequires: libcurl-devel
+%if 0%{?rhel} == 5
+BuildRequires: curl-devel
+%endif
+%if 0%{?fedora}
+BuildRequires: libcurl-devel
+%endif
- BuildRequires: graphviz
- BuildRequires: doxygen
+ BuildRequires: gnutls-devel
+ BuildRequires: libgcrypt-devel
+ BuildRequires: graphviz
+ BuildRequires: doxygen
Requires(post): info
Requires(preun): info
More information about the scm-commits
mailing list