From 18f8fbd0b4e67d08762f2c25760189a97a0ad8ff Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Jan 08 2011 03:21:32 +0000 Subject: fix build --- diff --git a/gnome-terminal-libs.patch b/gnome-terminal-libs.patch index b3b2eac..5f8ab26 100644 --- a/gnome-terminal-libs.patch +++ b/gnome-terminal-libs.patch @@ -1,15 +1,13 @@ -diff -up gnome-terminal-2.29.6/configure.ac.libs gnome-terminal-2.29.6/configure.ac ---- gnome-terminal-2.29.6/configure.ac.libs 2010-02-14 00:57:24.101114610 -0500 -+++ gnome-terminal-2.29.6/configure.ac 2010-02-14 01:19:46.989114501 -0500 -@@ -52,7 +52,10 @@ PKG_CHECK_MODULES([TERM], - gio-2.0 - gtk+-2.0 >= $GTK_REQUIRED - gconf-2.0 >= $GCONF_REQUIRED -- dbus-glib-1 >= $DBUS_GLIB_REQUIRED]) -+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED -+ x11]) -+ -+TERM_LIBS="$TERM_LIBS -lm" +diff -up gnome-terminal-2.33.3/src/Makefile.am.libs gnome-terminal-2.33.3/src/Makefile.am +--- gnome-terminal-2.33.3/src/Makefile.am.libs 2011-01-07 22:19:10.168992663 -0500 ++++ gnome-terminal-2.33.3/src/Makefile.am 2011-01-07 22:19:47.375993276 -0500 +@@ -75,7 +75,8 @@ gnome_terminal_CFLAGS = \ + gnome_terminal_LDFLAGS = - # Check the smclient backend - GDK_TARGET="$($PKG_CONFIG --variable target gdk-2.0)" + gnome_terminal_LDADD = \ +- $(TERM_LIBS) ++ $(TERM_LIBS) \ ++ -lX11 + + if WITH_SMCLIENT + gnome_terminal_SOURCES += \ diff --git a/gnome-terminal.spec b/gnome-terminal.spec index 84dbcca..4b02f85 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -19,6 +19,7 @@ Source0: http://download.gnome.org/sources/gnome-terminal/2.33/gnome-terminal-%{ Source1: profile-new-dialog.ui Patch0: gnome-terminal-builder.patch +Patch1: gnome-terminal-libs.patch # gconftool-2 Requires(pre): GConf2 >= %{gconf_version} @@ -48,6 +49,7 @@ clickable URLs. %prep %setup -q %patch0 -p1 -b .builder +%patch1 -p1 -b .libs autoreconf -i -f