From 5d465b8e6ca138d5e0a5dfaec07436ff1d166982 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 14 Feb 2010 04:09:06 +0000 Subject: [PATCH] Make ld happy --- libgnomecanvas-libs.patch | 17 +++++++++-------- libgnomecanvas.spec | 3 --- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/libgnomecanvas-libs.patch b/libgnomecanvas-libs.patch index 6ef1794..c690d8d 100644 --- a/libgnomecanvas-libs.patch +++ b/libgnomecanvas-libs.patch @@ -1,11 +1,12 @@ -diff -up libgnomecanvas-2.26.0/configure.in.libs libgnomecanvas-2.26.0/configure.in ---- libgnomecanvas-2.26.0/configure.in.libs 2010-02-13 22:45:28.642364057 -0500 -+++ libgnomecanvas-2.26.0/configure.in 2010-02-13 22:48:05.209114546 -0500 -@@ -89,6 +89,7 @@ CANVAS_MODULES="dnl - pangoft2 >= pango_required_version" - PKG_PROG_PKG_CONFIG([0.18]) - PKG_CHECK_MODULES(LIBGNOMECANVAS, $CANVAS_MODULES) -+LIBGNOMECANVAS_LIBS="$LIBGNOMECANVAS_LIBS -lm" +diff -up libgnomecanvas-2.26.0/configure.libs libgnomecanvas-2.26.0/configure +--- libgnomecanvas-2.26.0/configure.libs 2010-02-13 23:05:13.777363452 -0500 ++++ libgnomecanvas-2.26.0/configure 2010-02-13 23:06:40.070111238 -0500 +@@ -23837,6 +23837,8 @@ $as_echo "yes" >&6; } + : + fi ++LIBGNOMECANVAS_LIBS="$LIBGNOMECANVAS_LIBS -lm" ++ if test "$enable_maintainer_mode" = "yes"; then LIBGNOMECANVAS_DEPRECATED_CFLAGS="-DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES" + diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 68f8ca9..d8cda5a 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -22,7 +22,6 @@ BuildRequires: libglade2-devel >= %{libglade2_version} BuildRequires: gail-devel >= %{gail_version} BuildRequires: libtool gettext BuildRequires: intltool -BuildRequires: autoconf automake libtool %description The canvas widget allows you to create custom displays using stock items @@ -53,8 +52,6 @@ Tk canvas widget but has evolved quite a bit over time. %setup -q %patch0 -p1 -b .libs -autoreconf -i -f - %build export CFLAGS=$(echo $RPM_OPT_FLAGS |sed -e 's/O2/O1/g') %configure --disable-gtk-doc