rpms/elektra/devel elektra-0.6.10-open.patch, NONE, 1.1 elektra.spec, 1.1, 1.2

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	elektra.spec 
Added Files:
	elektra-0.6.10-open.patch 
Log Message:
* Sat Aug 25 2007 Patrice Dumas <pertusus at free.fr> 0.6.10-3
- protect ->(open) calls


elektra-0.6.10-open.patch:

--- NEW FILE elektra-0.6.10-open.patch ---
diff -up elektra-0.6.10/src/backends/berkeleydb/berkeleydb.c.open elektra-0.6.10/src/backends/berkeleydb/berkeleydb.c
--- elektra-0.6.10/src/backends/berkeleydb/berkeleydb.c.open	2007-08-25 15:34:49.000000000 +0200
+++ elektra-0.6.10/src/backends/berkeleydb/berkeleydb.c	2007-08-25 15:35:34.000000000 +0200
@@ -509,14 +509,14 @@ DBTree *dbTreeNew(KDBHandle handle,const
 		errno=KDB_RET_EBACKEND;
 		return 0;
 	}
-	ret=newDB->db.keyValuePairs->open(newDB->db.keyValuePairs,NULL,keyvalueFile,
+	ret=newDB->db.keyValuePairs->(open)(newDB->db.keyValuePairs,NULL,keyvalueFile,
 		DB_KEYVALUE, DB_BTREE, DB_CREATE | DB_EXCL | DB_THREAD, 0);
 	if (ret == EEXIST || ret == EACCES) {
 		/* DB already exist. Only open it */
-		ret=newDB->db.keyValuePairs->open(newDB->db.keyValuePairs,NULL, keyvalueFile,
+		ret=newDB->db.keyValuePairs->(open)(newDB->db.keyValuePairs,NULL, keyvalueFile,
 			DB_KEYVALUE, DB_BTREE, DB_THREAD, 0);
 		if (ret == EACCES)
-			ret=newDB->db.keyValuePairs->open(newDB->db.keyValuePairs,NULL,
+			ret=newDB->db.keyValuePairs->(open)(newDB->db.keyValuePairs,NULL,
 				keyvalueFile, DB_KEYVALUE, DB_BTREE, DB_THREAD | DB_RDONLY, 0);
 	} else newlyCreated=1;
 
@@ -548,14 +548,14 @@ DBTree *dbTreeNew(KDBHandle handle,const
 		DB_DUP | DB_DUPSORT);
 	if (ret != 0) fprintf(stderr, "set_flags: %s: %d\n",DB_PARENTINDEX,ret);
 	
-	ret = newDB->db.parentIndex->open(newDB->db.parentIndex,
+	ret = newDB->db.parentIndex->(open)(newDB->db.parentIndex,
 		NULL, parentsFile, DB_PARENTINDEX, DB_BTREE, DB_CREATE | DB_EXCL | DB_THREAD, 0);
 	if (ret == EEXIST || ret == EACCES) {
 		/* DB already exist. Only open it */
-		ret=newDB->db.parentIndex->open(newDB->db.parentIndex,NULL, parentsFile,
+		ret=newDB->db.parentIndex->(open)(newDB->db.parentIndex,NULL, parentsFile,
 			DB_PARENTINDEX, DB_BTREE, DB_THREAD, 0);
 		if (ret == EACCES)
-			ret=newDB->db.parentIndex->open(newDB->db.parentIndex,NULL,
+			ret=newDB->db.parentIndex->(open)(newDB->db.parentIndex,NULL,
 				parentsFile, DB_PARENTINDEX, DB_BTREE, DB_THREAD | DB_RDONLY, 0);
 	}
 	


Index: elektra.spec
===================================================================
RCS file: /cvs/extras/rpms/elektra/devel/elektra.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- elektra.spec	26 Mar 2007 01:26:26 -0000	1.1
+++ elektra.spec	25 Aug 2007 13:42:11 -0000	1.2
@@ -1,12 +1,13 @@
 Summary:       A key/value pair database to store software configurations
 Name:          elektra
 Version:       0.6.10
-Release:       2%{?dist}
+Release:       3%{?dist}
 Group:         System Environment/Libraries
 License:       BSD
 URL:           http://www.libelektra.org
 Source0:       http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:        elektra-0.6.10-nostart.patch
+Patch1:        elektra-0.6.10-open.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # doxygen: to build the API documentation
 # libxslt, docbook-style-xsl: to build man pages from docbook with xsltproc program
@@ -61,6 +62,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .nostart
+%patch1 -p1 -b .open
 
 %build
 %configure \
@@ -170,6 +172,9 @@
 
 
 %changelog
+* Sat Aug 25 2007 Patrice Dumas <pertusus at free.fr> 0.6.10-3
+- protect ->(open) calls
+
 * Mon Mar 12 2007 kwizart < kwizart at gmail.com > - 0.6.10-2
 - Disable static packages