diff --git a/q-7.5-curlopt.patch b/q-7.5-curlopt.patch new file mode 100644 index 0000000..196fa58 --- /dev/null +++ b/q-7.5-curlopt.patch @@ -0,0 +1,25 @@ +--- q-7.5/modules/curl/curl.c.curlopt 2006-10-31 19:19:44.000000000 +0100 ++++ q-7.5/modules/curl/curl.c 2006-10-31 19:24:10.000000000 +0100 +@@ -313,9 +313,9 @@ + #if LIBCURL_VERSION_NUM < 0x070a00 + #define CURLOPT_NOSIGNAL (-1) + #endif +-#if LIBCURL_VERSION_NUM < 0x070402 ++ + #define CURLOPT_PASSWDFUNCTION (-1) +-#endif ++ + #if LIBCURL_VERSION_NUM < 0x070702 + #define CURLOPT_HEADERFUNCTION (-1) + #endif +@@ -1006,10 +1006,6 @@ + cb = (int(*)())progress_cb; + dataopt = CURLOPT_PROGRESSDATA; + break; +- case CURLOPT_PASSWDFUNCTION: +- cb = (int(*)())passwd_cb; +- dataopt = CURLOPT_PASSWDDATA; +- break; + case CURLOPT_HEADERFUNCTION: + cb = (int(*)())header_cb; + dataopt = CURLOPT_WRITEHEADER; diff --git a/q.spec b/q.spec index 672d55c..0c7dcef 100644 --- a/q.spec +++ b/q.spec @@ -1,11 +1,12 @@ Name: q Version: 7.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Equational programming language Group: Development/Languages License: GPL Source: http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.5.tar.gz +Patch0: q-7.5-curlopt.patch URL: http://q-lang.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ImageMagick-devel @@ -64,6 +65,7 @@ the server, allowing Apache handlers to be written in Q. %prep %setup -q +%patch0 -p1 sed -i 's|/usr/sbin/apxs2|/usr/sbin/apxs -I../src -L../src|' mod_q/Makefile sed -i 's|@libtool@|libtool|' src/Makefile.in @@ -154,6 +156,9 @@ fi %changelog +* Tue Oct 31 2006 Gerard Milmeister - 7.5-2 +- patch for curl options + * Tue Oct 31 2006 Gerard Milmeister - 7.5-1 - new version 7.5