Merge branch 'master' into el6

This commit is contained in:
Tim Niemueller 2010-11-16 00:28:52 -05:00
commit 1bf66d301f

View File

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