From 7d9acc3df83d79facca6a8ec6bd246ef553ad149 Mon Sep 17 00:00:00 2001
From: epienbro <epienbro@fedoraproject.org>
Date: Fri, 27 Feb 2009 22:43:35 +0000
Subject: [PATCH] - Update to version 0.4.0a - Drop upstreamed patch - Added a
 new patch to fix a 64bit issue - The -devel package now contains a pkgconfig
 file - The configure script is now run with '--enable-messages
 --enable-https' - Made the -doc subpackage noarch (F11+)

---
 libmicrohttpd.spec                     | 23 +++++++++++++++++------
 libmicrohttpd_64bit_fix.patch          | 11 +++++++++++
 libmicrohttpd_fix_0_4_0_testcase.patch | 11 -----------
 3 files changed, 28 insertions(+), 17 deletions(-)
 create mode 100644 libmicrohttpd_64bit_fix.patch
 delete mode 100644 libmicrohttpd_fix_0_4_0_testcase.patch

diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec
index 04badb6..615ded1 100644
--- a/libmicrohttpd.spec
+++ b/libmicrohttpd.spec
@@ -1,16 +1,15 @@
 Summary: Lightweight library for embedding a webserver in applications
 Name: libmicrohttpd
-Version: 0.4.0
-Release: 2%{?dist}
+Version: 0.4.0a
+Release: 1%{?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
 
-# In version 0.4.0, two of the testcases fail on 64bit environments
-# Upstream bug #1454
-Patch0: libmicrohttpd_fix_0_4_0_testcase.patch
+# https://gnunet.org/mantis/view.php?id=1459
+Patch0: libmicrohttpd_64bit_fix.patch
 
 BuildRequires:	libcurl-devel
 BuildRequires:	graphviz
@@ -45,6 +44,9 @@ Development files for libmicrohttpd
 Summary:	Documentation for libmicrohttpd
 Group:		Documentation
 Requires:	%{name} = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:	noarch
+%endif
 
 %description doc
 Doxygen documentation for libmicrohttpd and some example source code
@@ -59,7 +61,7 @@ unlink doc/Doxyfile
 mv tmp doc/Doxyfile
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-messages --enable-https
 make %{?_smp_mflags}
 doxygen doc/Doxyfile
 
@@ -104,6 +106,7 @@ fi
 %defattr(-,root,root,-)
 %{_includedir}/microhttpd.h
 %{_libdir}/libmicrohttpd.so
+%{_libdir}/pkgconfig/libmicrohttpd.pc
 
 %files doc
 %defattr(-,root,root,-)
@@ -114,6 +117,14 @@ fi
 %doc html
 
 %changelog
+* Fri Feb 27 2009 Erik van Pienbroek <info@nntpgrab.nl> - 0.4.0a-1
+- Update to version 0.4.0a
+- Drop upstreamed patch
+- Added a new patch to fix a 64bit issue
+- The -devel package now contains a pkgconfig file
+- The configure script is now run with '--enable-messages --enable-https'
+- Made the -doc subpackage noarch (F11+)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/libmicrohttpd_64bit_fix.patch b/libmicrohttpd_64bit_fix.patch
new file mode 100644
index 0000000..0f8442b
--- /dev/null
+++ b/libmicrohttpd_64bit_fix.patch
@@ -0,0 +1,11 @@
+--- 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 ();
diff --git a/libmicrohttpd_fix_0_4_0_testcase.patch b/libmicrohttpd_fix_0_4_0_testcase.patch
deleted file mode 100644
index d6ad6d0..0000000
--- a/libmicrohttpd_fix_0_4_0_testcase.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/testcurl/daemontest_long_header.c.orig	2009-02-14 11:48:18.025431339 +0100
-+++ src/testcurl/daemontest_long_header.c	2009-02-14 11:48:37.442183967 +0100
-@@ -107,7 +107,7 @@
-                         &ahc_echo,
-                         "GET",
-                         MHD_OPTION_CONNECTION_MEMORY_LIMIT,
--                        VERY_LONG / 2, MHD_OPTION_END);
-+                        (size_t) VERY_LONG / 2, MHD_OPTION_END);
-   if (d == NULL)
-     return 1;
-   c = curl_easy_init ();