rpms/gedit/devel 0001-Fix-libm-and-libX11-linking.patch, NONE, 1.1 gedit.spec, 1.213, 1.214 0001-Fix-libm-linking.patch, 1.1, NONE

[Bastien Nocera]

Author: hadess

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

Modified Files:
	gedit.spec 
Added Files:
	0001-Fix-libm-and-libX11-linking.patch 
Removed Files:
	0001-Fix-libm-linking.patch 
Log Message:
Fix libX11 linking

0001-Fix-libm-and-libX11-linking.patch:
 configure.ac |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE 0001-Fix-libm-and-libX11-linking.patch ---
>From d0b56b9154ad47a4391839b814587e76d70e5fb4 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Wed, 10 Feb 2010 17:42:24 +0000
Subject: [PATCH] Fix libm and libX11 linking

Otherwise we fail to link:
/usr/bin/ld: ./.libs/libgedit.a(gedit-print-preview.o): undefined reference to symbol 'floor@@GLIBC_2.2.5'
/usr/bin/ld: note: 'floor@@GLIBC_2.2.5' is defined in DSO /lib64/libm.so.6 so try adding it to the linker command line
/lib64/libm.so.6: could not read symbols: Invalid operation

And:
/usr/bin/ld: ./.libs/libgedit.a(gedit-utils.o): undefined reference to symbol 'XFree'
/usr/bin/ld: note: 'XFree' is defined in DSO /usr/lib64/libX11.so.6 so try adding it to the linker command line
/usr/lib64/libX11.so.6: could not read symbols: Invalid operation

https://bugzilla.gnome.org/show_bug.cgi?id=609562
---
 configure.ac |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index b9c2632..63238b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,7 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2)
 GTK_DOC_CHECK([1.0],[--flavour=no-tmpl])
 AC_CHECK_FUNCS(fsync)
 AC_CHECK_FUNC(sigaction)
+AC_CHECK_LIB(m, floor)
 
 dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
 AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I m4")
@@ -252,6 +253,7 @@ PKG_CHECK_MODULES(GEDIT, [
 	gio-2.0 >= 2.23.1
 	gtk+-2.0 >= 2.16.0
 	gtksourceview-2.0 >= 2.9.4
+	x11
 	gconf-2.0 >= 1.1.11
 ])
 
-- 
1.6.6



Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -p -r1.213 -r1.214
--- gedit.spec	10 Feb 2010 17:45:25 -0000	1.213
+++ gedit.spec	10 Feb 2010 17:57:01 -0000	1.214
@@ -46,7 +46,7 @@ Patch2: gedit-2.25.5-fix-python-path.pat
 Patch3: print-to-file.patch
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=609562
-Patch4: 0001-Fix-libm-linking.patch
+Patch4: 0001-Fix-libm-and-libX11-linking.patch
 
 BuildRequires: gnome-common
 BuildRequires: glib2-devel >= %{glib2_version}


--- 0001-Fix-libm-linking.patch DELETED ---