rpms/q/devel q-7.5-curlopt.patch,NONE,1.1 q.spec,1.5,1.6

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/extras/rpms/q/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10629

Modified Files:
	q.spec 
Added Files:
	q-7.5-curlopt.patch 
Log Message:
patch for curloptions

q-7.5-curlopt.patch:

--- NEW FILE q-7.5-curlopt.patch ---
--- 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;


Index: q.spec
===================================================================
RCS file: /cvs/extras/rpms/q/devel/q.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- q.spec	31 Oct 2006 16:15:09 -0000	1.5
+++ q.spec	31 Oct 2006 18:27:23 -0000	1.6
@@ -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 @@
 
 %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 @@
 
 
 %changelog
+* Tue Oct 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 7.5-2
+- patch for curl options
+
 * Tue Oct 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 7.5-1
 - new version 7.5