rpms/glibmm24/devel glibmm-2.18.0-gio-header-fix.patch, 1.1, 1.2 glibmm.spec, 1.44, 1.45

[Adel Gadllah]

Author: drago01

Update of /cvs/pkgs/rpms/glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20901

Modified Files:
	glibmm-2.18.0-gio-header-fix.patch glibmm.spec 
Log Message:
Patch error.h directly rather than error.hg

glibmm-2.18.0-gio-header-fix.patch:

Index: glibmm-2.18.0-gio-header-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm-2.18.0-gio-header-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glibmm-2.18.0-gio-header-fix.patch	5 Oct 2008 10:03:07 -0000	1.1
+++ glibmm-2.18.0-gio-header-fix.patch	5 Oct 2008 11:21:14 -0000	1.2
@@ -1,7 +1,7 @@
-diff -upNr glibmm-2.18.0.orign/gio/src/error.hg glibmm-2.18.0/gio/src/error.hg
---- glibmm-2.18.0.orign/gio/src/error.hg	2008-07-16 18:38:00.000000000 +0200
-+++ glibmm-2.18.0/gio/src/error.hg	2008-10-05 11:52:14.000000000 +0200
-@@ -19,6 +19,16 @@
+diff -upNr glibmm-2.18.0.orign/gio/giomm/error.h glibmm-2.18.0/gio/giomm/error.h
+--- glibmm-2.18.0.orign/gio/giomm/error.h	2008-07-25 21:11:43.000000000 +0200
++++ glibmm-2.18.0/gio/giomm/error.h	2008-10-05 13:10:19.000000000 +0200
+@@ -27,6 +27,15 @@
  
  #include <glibmm/interface.h>
  
@@ -14,11 +14,10 @@
 +#define GIOMM_SAVED_HOST_NOT_FOUND HOST_NOT_FOUND
 +#undef HOST_NOT_FOUND
 +#endif // HOST_NOT_FOUND
-+
- _DEFS(giomm,gio)
- _PINCLUDE(glibmm/private/interface_p.h)
  
-@@ -35,3 +45,8 @@ _WRAP_GERROR(Error, GIOErrorEnum, G_IO_E
+ namespace Gio
+ {
+@@ -96,6 +105,11 @@ private:
  
  } // namespace Gio
  
@@ -27,3 +26,6 @@
 +#define HOST_NOT_FOUND GIOMM_SAVED_HOST_NOT_FOUND
 +#undef GIOMM_SAVED_HOST_NOT_FOUND
 +#endif // GIOMM_SAVED_HOST_NOT_FOUND
+ 
+ #endif /* _GIOMM_ERROR_H */
+ 


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- glibmm.spec	5 Oct 2008 10:03:07 -0000	1.44
+++ glibmm.spec	5 Oct 2008 11:21:14 -0000	1.45
@@ -1,6 +1,6 @@
 Name:           glibmm24
 Version:        2.18.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Sun Oct 05 2008 Adel Gadllah <adel.gadllah at gmail.com> - 2.18.0-3
+- Patch error.h directly rather than error.hg
+
 * Sun Oct 05 2008 Adel Gadllah <adel.gadllah at gmail.com> - 2.18.0-2
 - Backport upstream fix that resolves HOST_NOT_FOUND
   symbol conflicts (GNOME #529496)