From ee6541a10b26fbb8967aebf54da138f97d6995b1 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 9 Feb 2010 22:48:31 +0000 Subject: [PATCH] - fix nmcli-build.patch hack for the stricter ld (fixes FTBFS) (but why are we patching nmcli to build in the NetworkManager tree at all, as opposed to packaging it separately as it appears to be designed to?) --- NetworkManager.spec | 1 + nmcli-build.patch | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index f4ccce1..15c0fc1 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -392,6 +392,7 @@ fi * Tue Feb 09 2010 Kevin Kofler - 0.8-0.3.git20100129 - don't autostart in KDE on F13+ (#541353) - validate the autostart .desktop file +- fix nmcli-build.patch hack for the stricter ld (fixes FTBFS) * Fri Jan 29 2010 Dan Williams - 0.8-0.2.git20100129 - core: add Bluetooth Dial-Up Networking (DUN) support (rh #136663) diff --git a/nmcli-build.patch b/nmcli-build.patch index 3cc901e..af884bf 100644 --- a/nmcli-build.patch +++ b/nmcli-build.patch @@ -27,4 +27,4 @@ diff -up NetworkManager-0.7.999/nmcli/src/CMakeLists.txt.foo NetworkManager-0.7. ADD_EXECUTABLE (nmcli ${NMCLI_SRC}) -TARGET_LINK_LIBRARIES (nmcli ${LIBNM_LIBRARIES}) -+TARGET_LINK_LIBRARIES (nmcli -L../../libnm-util/.libs/ -L../../libnm-glib/.libs/ -lnm-glib -lnm-util -lnm-glib-vpn) ++TARGET_LINK_LIBRARIES (nmcli -L../../libnm-util/.libs/ -L../../libnm-glib/.libs/ -lnm-glib -lnm-util -lnm-glib-vpn ${DBUS_GLIB_LIBRARIES})