Merge branch 'master' into el6

libmicrohttpd.spec

@@ -1,16 +1,18 @@
 Summary: Lightweight library for embedding a webserver in applications
 Name: libmicrohttpd
 Version: 0.9.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Development/Libraries
 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
 
-BuildRequires:	libcurl-devel
-BuildRequires:	graphviz
-BuildRequires:	doxygen
+BuildRequires:  libcurl-devel
+BuildRequires:  gnutls-devel
+BuildRequires:  libgcrypt-devel
+BuildRequires:  graphviz
+BuildRequires:  doxygen
 
 Requires(post): info
 Requires(preun): info
@@ -30,19 +32,19 @@ Key features that distinguish libmicrohttpd from other projects are:
 * Three different threading models
 
 %package devel
-Summary:	Development files for libmicrohttpd
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Summary:        Development files for libmicrohttpd
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
 Development files for libmicrohttpd
 
 %package doc
-Summary:	Documentation for libmicrohttpd
-Group:		Documentation
-Requires:	%{name} = %{version}-%{release}
-%if 0%{?fedora} >= 11
-BuildArch:	noarch
+Summary:        Documentation for libmicrohttpd
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+BuildArch:      noarch
 %endif
 
 %description doc
@@ -57,7 +59,7 @@ unlink doc/Doxyfile
 mv tmp doc/Doxyfile
 
 %build
-%configure --disable-static
+%configure --disable-static --with-gnutls
 make %{?_smp_mflags}
 doxygen doc/Doxyfile
 
@@ -93,7 +95,7 @@ fi
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
-	
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING
@@ -115,6 +117,9 @@ fi
 %doc html
 
 %changelog
+* Tue Nov 16 2010 Tim Niemueller <tim@niemueller.de> - 0.9.2-2
+- Add missing BR gnutls-devel and libgcrypt-devel
+
 * Tue Nov 16 2010 Tim Niemueller <tim@niemueller.de> - 0.9.2-2
 - Re-enable HTTPS, configure flags had unexpected result