rpms/nss_db/devel nss_db-2.2-glibc.patch, NONE, 1.1 nss_db.spec, 1.35, 1.36

[Nalin Somabhai Dahyabhai (nalin)]

Author: nalin

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

Modified Files:
	nss_db.spec 
Added Files:
	nss_db-2.2-glibc.patch 
Log Message:
adapt to open-is-a-macro cases

nss_db-2.2-glibc.patch:

--- NEW FILE nss_db-2.2-glibc.patch ---
Avoid macro expansion if open() is a macro.

diff -up nss_db-2.2/db-compat.c nss_db-2.2/db-compat.c
--- nss_db-2.2/db-compat.c	2007-08-14 10:05:07.000000000 -0400
+++ nss_db-2.2/db-compat.c	2007-08-14 10:05:09.000000000 -0400
@@ -39,7 +39,7 @@ db_open (const char *file, DBTYPE type, 
   if (err)
     return err;
 
-  err = db->open (db, NULL, file, NULL, type, flags, mode);
+  err = (db->open) (db, NULL, file, NULL, type, flags, mode);
   if (err)
     {
       db->close (db, 0);


Index: nss_db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss_db/devel/nss_db.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- nss_db.spec	13 Aug 2007 22:21:18 -0000	1.35
+++ nss_db.spec	14 Aug 2007 14:15:04 -0000	1.36
@@ -2,7 +2,7 @@
 Summary: An NSS library for the Berkeley DB
 Name: nss_db
 Version: 2.2
-Release: 37
+Release: 38
 Source: ftp://sources.redhat.com/pub/glibc/releases/nss_db-%{version}.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
 Source2: db-getent-Makefile
@@ -16,6 +16,7 @@
 Patch7: nss_db-2.2-initialize.patch
 Patch8: nss_db-2.2-order.patch
 Patch9: nss_db-2.2-lib64.patch
+Patch10: nss_db-2.2-glibc.patch
 Patch100: db-4.6.18-glibc.patch
 # DB is under the Sleepycat (Oracle) license.
 # nss_db is under the LGPLv2+ license.
@@ -49,6 +50,7 @@
 %patch7 -p1 -b .initialize
 %patch8 -p1 -b .order
 %patch9 -p1 -b .lib64
+%patch10 -p1 -b .glibc
 rm -f config.guess config.sub ltmain.sh
 autoreconf -i
 
@@ -113,6 +115,9 @@
 %config(noreplace) /var/db/Makefile
 
 %changelog
+* Tue Aug 14 2007 Nalin Dahyabhai <nalin at redhat.com> - 2.2-38
+- adapt to open-is-a-macro cases
+
 * Mon Aug 13 2007 Nalin Dahyabhai <nalin at redhat.com> - 2.2-37
 - update to use DB 4.6.18, swiping needed patches from the db4 package
 - clarify license tag