From d747292cc38b8bdc3085e742bd739276e1bc441a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Nov 25 2008 14:55:25 +0000 Subject: drop spurious linkage --- diff --git a/broken-xml.patch b/broken-xml.patch deleted file mode 100644 index 54e23b0..0000000 --- a/broken-xml.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up dbus-glib-0.73/dbus/dbus-gobject.c.broken-xml dbus-glib-0.73/dbus/dbus-gobject.c ---- dbus-glib-0.73/dbus/dbus-gobject.c.broken-xml 2007-08-01 22:17:59.000000000 -0400 -+++ dbus-glib-0.73/dbus/dbus-gobject.c 2007-08-01 22:18:25.000000000 -0400 -@@ -488,8 +488,6 @@ write_interface (gpointer key, gpointer - } - - g_free (dbus_type); -- -- g_string_append (xml, " \n"); - } - g_slist_free (values->properties); - diff --git a/dbus-glib.spec b/dbus-glib.spec index 7c6555c..8c5189b 100644 --- a/dbus-glib.spec +++ b/dbus-glib.spec @@ -8,7 +8,7 @@ Summary: GLib bindings for D-Bus Name: dbus-glib Version: 0.76 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.freedesktop.org/software/dbus/ Source0: http://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz Source1: dbus-bus-introspect.xml @@ -16,6 +16,8 @@ Source1: dbus-bus-introspect.xml Patch0: dbus-gproxy-cancel.patch # https://bugs.freedesktop.org/show_bug.cgi?id=16114 Patch7: dbus-glib-0.74-getall-wincaps-to-uscore.patch +# http://bugs.freedesktop.org/show_bug.cgi?id=18698 +Patch8: gethostbyname.patch License: AFL and GPLv2+ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -68,9 +70,11 @@ D-Bus tools written using the gtk+ GUI libaries %patch0 -p1 -b .gproxy-cancel %patch7 -p1 -b .getall-wincaps-to-uscore +%patch8 -p1 -b .gethostbyname %patch10 -p1 -b .bash-completion %build +libtoolize --force --copy autoreconf %configure --disable-tests \ --enable-verbose-mode=yes \ @@ -128,6 +132,9 @@ rm -rf %{buildroot} %endif %changelog +* Tue Nov 25 2008 Matthias Clasen - 0.76-4 +- Avoid some spurious linkage + * Mon Nov 17 2008 Dan Williams - 0.76-3 - Fix crashes when a tracked service restarts too quickly (fdo #18573) diff --git a/gethostbyname.patch b/gethostbyname.patch new file mode 100644 index 0000000..11dfeac --- /dev/null +++ b/gethostbyname.patch @@ -0,0 +1,12 @@ +diff -up dbus-glib-0.76/configure.ac.gethostbyname dbus-glib-0.76/configure.ac +--- dbus-glib-0.76/configure.ac.gethostbyname 2008-11-25 03:11:57.000000000 -0500 ++++ dbus-glib-0.76/configure.ac 2008-11-25 03:12:23.000000000 -0500 +@@ -438,7 +438,7 @@ fi + + #### Various functions + AC_CHECK_LIB(socket,socket) +-AC_CHECK_LIB(nsl,gethostbyname) ++AC_SEARCH_LIBS([gethostbyname],[nsl]) + + AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep poll setenv unsetenv socketpair getgrouplist) +