rpms/libgnome/devel libgnome-2.9.1-popt.patch, NONE, 1.1 libgnome.spec, 1.22, 1.23

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/libgnome/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6743

Modified Files:
	libgnome.spec 
Added Files:
	libgnome-2.9.1-popt.patch 
Log Message:
Fix s390


libgnome-2.9.1-popt.patch:
 gnome-gconf.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE libgnome-2.9.1-popt.patch ---
--- libgnome-2.9.1/libgnome/gnome-gconf.c.popt	2005-03-18 11:34:23.000000000 -0500
+++ libgnome-2.9.1/libgnome/gnome-gconf.c	2005-03-18 11:34:42.000000000 -0500
@@ -27,6 +27,8 @@
 #include <config.h>
 #include <stdlib.h>
 
+#include <popt.h>
+
 #define GCONF_ENABLE_INTERNALS
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>


Index: libgnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libgnome.spec	17 Mar 2005 20:02:31 -0000	1.22
+++ libgnome.spec	18 Mar 2005 16:36:41 -0000	1.23
@@ -12,7 +12,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.9.1
-Release: 2
+Release: 3
 URL: ftp://ftp.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -49,6 +49,7 @@
 Patch4: libgnome-2.7.2-default-cursor.patch
 Patch5: libgnome-2.8.0-default-browser.patch
 Patch6: libgnome-2.8.0-stat-homedir.patch
+Patch7: libgnome-2.9.1-popt.patch
 
 # Added to avoid the warning messages about utmp group, bug #24171
 # fixme, just libzvt?
@@ -101,6 +102,7 @@
 %patch4 -p1 -b .default-cursor
 %patch5 -p1 -b .default-browser
 %patch6 -p1 -b .stat-homedir
+%patch7 -p1 -b .popt
 
 %build
 intltoolize -f
@@ -155,6 +157,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Mar 18 2005 Matthias Clasen <mclasen at redhat.com> - 2.9.1-3
+- Fix the build on s390
+
 * Thu Mar 17 2005 Matthias Clasen <mclasen at redhat.com> - 2.9.1-2
 - Switch to Clearlooks as default gtk theme, gnome as default
   icon theme