rpms/libmicrohttpd
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into el6

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Tim Niemueller 2010-11-16 00:06:53 -05:00
commit 6c9373671c
4 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1 +1,4 @@
libmicrohttpd-0.4.2.tar.gz
libmicrohttpd-0.9.2*
/.build*
/x86_64
/noarch

23
libmicrohttpd.spec
View File

@ -1,6 +1,6 @@
Summary: Lightweight library for embedding a webserver in applications
Name: libmicrohttpd
Version: 0.4.2
Version: 0.9.2
Release: 2%{?dist}
Group: Development/Libraries
License: LGPLv2+
@ -31,7 +31,7 @@ Key features that distinguish libmicrohttpd from other projects are:
%package devel
Summary: Development files for libmicrohttpd
Group: %{group}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
@ -57,7 +57,7 @@ unlink doc/Doxyfile
mv tmp doc/Doxyfile
%build
%configure --disable-static --enable-messages --enable-https
%configure --disable-static
make %{?_smp_mflags}
doxygen doc/Doxyfile
@ -71,7 +71,7 @@ make install DESTDIR=%{buildroot}
rm -f %{buildroot}%{_libdir}/libmicrohttpd.la
rm -f %{buildroot}%{_infodir}/dir
# Install some examples in /usr/share/doc/libmicrohttpd-%{version}/examples
# Install some examples in /usr/share/doc/libmicrohttpd-${version}/examples
mkdir examples
install -m 644 src/examples/*.c examples
@ -83,10 +83,12 @@ rm -rf %{buildroot}
%post doc
/sbin/install-info %{_infodir}/microhttpd.info.gz %{_infodir}/dir || :
/sbin/install-info %{_infodir}/microhttpd-tutorial.info.gz %{_infodir}/dir || :
%preun doc
if [ $1 = 0 ] ; then
/sbin/install-info --delete %{_infodir}/microhttpd.info.gz %{_infodir}/dir || :
/sbin/install-info --delete %{_infodir}/microhttpd-tutorial.info.gz %{_infodir}/dir || :
fi
%post -p /sbin/ldconfig
@ -95,8 +97,7 @@ fi
%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/libmicrohttpd.so.5
%{_libdir}/libmicrohttpd.so.5.1.0
%{_libdir}/libmicrohttpd.so.*
%files devel
%defattr(-,root,root,-)
@ -108,11 +109,21 @@ fi
%defattr(-,root,root,-)
%{_mandir}/man3/libmicrohttpd.3.gz
%{_infodir}/microhttpd.info.gz
%{_infodir}/microhttpd-tutorial.info.gz
%doc AUTHORS README ChangeLog
%doc examples
%doc html
%changelog
* Tue Nov 16 2010 Tim Niemueller <tim@niemueller.de> - 0.9.2-2
- Re-enable HTTPS, configure flags had unexpected result
* Sun Nov 7 2010 Tim Niemueller <tim@niemueller.de> - 0.9.2-1
- Update to 0.9.2
* Sun Jun 4 2010 Erik van Pienbroek <epienbro@fedoraproject.org> - 0.4.6-1
- Update to 0.4.6
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

11
libmicrohttpd_64bit_fix.patch
View File

@ -1,11 +0,0 @@
--- src/testcurl/daemontest_large_put.c.orig 2009-02-27 22:58:16.926062599 +0100
+++ src/testcurl/daemontest_large_put.c 2009-02-27 22:58:20.776312622 +0100
@@ -274,7 +274,7 @@
1082,
NULL, NULL, &ahc_echo, &done_flag,
MHD_OPTION_CONNECTION_MEMORY_LIMIT,
- PUT_SIZE * 4, MHD_OPTION_END);
+ (size_t) PUT_SIZE * 4, MHD_OPTION_END);
if (d == NULL)
return 256;
c = curl_easy_init ();

2
sources
View File

@ -1 +1 @@
2853d8f32417e3c5f3b18fda38f96e52 libmicrohttpd-0.4.2.tar.gz
4ad4a2f1ad4cf3174d248a6e73cf4d1b libmicrohttpd-0.9.2.tar.gz