rpms/glade2/devel gtk-includes.patch, NONE, 1.1 glade2.spec, 1.36, 1.37

Matthias Clasen mclasen at fedoraproject.org
Wed Oct 1 17:03:01 UTC 2008


Author: mclasen

Update of /cvs/extras/rpms/glade2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27939

Modified Files:
	glade2.spec 
Added Files:
	gtk-includes.patch 
Log Message:
fix the build


gtk-includes.patch:

--- NEW FILE gtk-includes.patch ---
diff -up glade-2.12.2/glade/gbwidgets/gbclist.c.deprecation glade-2.12.2/glade/gbwidgets/gbclist.c
--- glade-2.12.2/glade/gbwidgets/gbclist.c.deprecation	2008-10-01 12:59:52.000000000 -0400
+++ glade-2.12.2/glade/gbwidgets/gbclist.c	2008-10-01 13:00:02.000000000 -0400
@@ -19,10 +19,7 @@
 
 #include <string.h>
 
-#include <gtk/gtkclist.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkspinbutton.h>
+#include <gtk/gtk.h>
 #include "../gb.h"
 
 /* Include the 21x21 icon pixmap for this widget, to be used in the palette */


Index: glade2.spec
===================================================================
RCS file: /cvs/extras/rpms/glade2/devel/glade2.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- glade2.spec	21 Jul 2008 18:06:18 -0000	1.36
+++ glade2.spec	1 Oct 2008 17:02:31 -0000	1.37
@@ -16,11 +16,12 @@
 Summary:        A GTK+ GUI builder.
 Name:           glade2
 Version:        2.12.2
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 License:        GPLv2+ and GFDL
 URL:            http://glade.gnome.org/
 Source:         http://download.gnome.org/sources/glade/2.12/glade-%{version}.tar.bz2
 Patch0:         gnome-i18n.patch
+Patch1:		gtk-includes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Group:          Development/Tools
 
@@ -51,6 +52,7 @@
 %prep
 %setup -q -n glade-%{version}
 %patch0 -p1 -b .gnome-i18n
+%patch1 -p1 -b .gtk-includes
 
 %build
 %configure --disable-gnome-db 
@@ -83,6 +85,9 @@
 %{_bindir}/*
 
 %changelog
+* Wed Oct  1 2008 Matthias Clasen  <mclasen at redhat.com> - 2.12.2-4
+- Make it build
+
 * Mon Jul 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.12.2-3
 - fix license tag
 




More information about the scm-commits mailing list