rpms/glib2/devel glib-2.7.6-c++.patch, NONE, 1.1 glib2.spec, 1.50, 1.51

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/glib2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19650

Modified Files:
	glib2.spec 
Added Files:
	glib-2.7.6-c++.patch 
Log Message:
Fix gstdio C++ guards


glib-2.7.6-c++.patch:
 gstdio.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE glib-2.7.6-c++.patch ---
--- glib-2.7.6/glib/gstdio.h.c++	2005-08-05 10:06:16.000000000 -0400
+++ glib-2.7.6/glib/gstdio.h	2005-08-05 10:08:46.000000000 -0400
@@ -25,10 +25,10 @@
 
 #include <sys/stat.h>
 
-#if defined(G_OS_UNIX) && !defined(G_STDIO_NO_WRAP_ON_UNIX)
-
 G_BEGIN_DECLS
 
+#if defined(G_OS_UNIX) && !defined(G_STDIO_NO_WRAP_ON_UNIX)
+
 /* Just pass on to the system functions, so there's no potential for data
  * format mismatches, especially with large file interfaces.
  */
@@ -100,8 +100,8 @@
                  const gchar *mode,
                  FILE        *stream);
 
-G_END_DECLS
-
 #endif /* G_OS_UNIX */
 
+G_END_DECLS
+
 #endif /* __G_STDIO_H__ */


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- glib2.spec	4 Aug 2005 14:25:48 -0000	1.50
+++ glib2.spec	5 Aug 2005 14:10:07 -0000	1.51
@@ -1,13 +1,14 @@
 Summary: A library of handy utility functions.
 Name: glib2
 Version: 2.7.6
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 Source: glib-%{version}.tar.bz2
 Source2: glib2.sh
 Source3: glib2.csh
 Patch0: glib-2.7.6-atomic.patch
+Patch1: glib-2.7.6-c++.patch
 Conflicts: libgnomeui <= 2.2.0
 BuildRoot: %{_tmppath}/glib-%{PACKAGE_VERSION}-root
 BuildRequires: pkgconfig >= 0.8
@@ -38,6 +39,7 @@
 %prep
 %setup -q -n glib-%{version}
 %patch0 -p1 -b .atomic
+%patch1 -p1 -b .c++
 
 %build
 
@@ -97,6 +99,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Aug  5 2005 Matthias Clasen <mclasen at redhat.com> - 2.7.6-3
+- Fix C++ guards in gstdio.h
+
 * Thu Aug  4 2005 Matthias Clasen <mclasen at redhat.com> - 2.7.6-2
 - Another attempt to fix atomic ops on s390