rpms/callweaver/devel callweaver-open-macro.patch, NONE, 1.1 callweaver.spec, 1.4, 1.5

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/pkgs/rpms/callweaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3607

Modified Files:
	callweaver.spec 
Added Files:
	callweaver-open-macro.patch 
Log Message:
more open() fallout

callweaver-open-macro.patch:

--- NEW FILE callweaver-open-macro.patch ---
--- callweaver-RC-1.1.99.20070822/corelib/file.c~	2007-08-19 23:45:08.000000000 +0100
+++ callweaver-RC-1.1.99.20070822/corelib/file.c	2007-08-23 09:48:51.000000000 +0100
@@ -434,7 +434,7 @@ static int opbx_filehelper(const char *f
 								if (bfile)
                                 {
 									ret = 1;
-									s = f->open(bfile);
+									s = (f->open)(bfile);
 									if (s)
                                     {
 										s->lasttimeout = -1;
@@ -863,7 +863,7 @@ struct opbx_filestream *opbx_readfile(co
 		if (bfile) {
 			errno = 0;
 
-			if (!(fs = f->open(bfile))) {
+			if (!(fs = (f->open)(bfile))) {
 				opbx_log(LOG_WARNING, "Unable to open %s\n", fn);
 				fclose(bfile);
 				free(fn);


Index: callweaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/callweaver/devel/callweaver.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- callweaver.spec	22 Aug 2007 17:41:58 -0000	1.4
+++ callweaver.spec	23 Aug 2007 08:50:28 -0000	1.5
@@ -7,7 +7,7 @@
 
 Name:		callweaver
 Version:	1.2
-Release:	0.2.rc4.20070822
+Release:	0.3.rc4.20070822
 Summary:	The Truly Open Source PBX
 
 Group:		Applications/Internet
@@ -15,6 +15,7 @@
 URL:		http://www.callweaver.org/
 Source0:	http://devs.callweaver.org/1.2_snapshots/callweaver-RC-1.1.99.20070822.tar.gz
 Patch0:		callweaver-zap-build-fix.patch
+Patch1:		callweaver-open-macro.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	spandsp-devel >= 0.0.4-0.1.pre4
@@ -173,6 +174,7 @@
 %prep
 %setup -q -n callweaver-RC-1.1.99.20070822
 %patch0 -p1
+%patch1 -p1
 
 %build
 %if 0%{?snap}
@@ -373,6 +375,9 @@
 %{_sbindir}/eogi*
 
 %changelog
+* Thu Aug 23 2007 David Woodhouse <dwmw2 at infradead.org> 1.2-0.3.rc4.20070822
+- Handle open() being a macro
+
 * Wed Aug 22 2007 David Woodhouse <dwmw2 at infradead.org> 1.2-0.2.rc4.20070822
 - Update to RC4.20070822 snapshot