From 1321eb99ebfb1e1a9be108679aa142cd3489fd9a Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Thu, 24 Nov 2011 10:50:35 -0600 Subject: [PATCH] Rebuild for libgnome-bluetooth.so.9 --- NetworkManager.spec | 5 +- nm-applet-internal-buildfixes.patch | 94 +++++++++++++++-------------- 2 files changed, 53 insertions(+), 46 deletions(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index f9127b4..d398ac1 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -15,7 +15,7 @@ Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 Version: 0.9.2 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -462,6 +462,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libdir}/libnm-gtk.so %changelog +* Thu Nov 24 2011 Daniel Drake - 0.9.2-2 +- Rebuild for libgnome-bluetooth.so.9 + * Thu Nov 09 2011 Dan Williams - 0.9.2-1 - core: fix possible crash when talking to ModemManager - core: improve handling of rfkill on some machines (eeepc 1005HA and others) diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch index ad1d14c..f0656a6 100644 --- a/nm-applet-internal-buildfixes.patch +++ b/nm-applet-internal-buildfixes.patch @@ -1,7 +1,8 @@ -diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac ---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400 -+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac 2009-07-28 13:11:39.261718877 -0400 -@@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) +Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac +=================================================================== +--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/configure.ac ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac +@@ -98,10 +98,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.74 glib-2.0 >= 2.16 @@ -12,21 +13,20 @@ diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac.buil gmodule-export-2.0]) PKG_CHECK_MODULES(GCONF, [gconf-2.0]) -@@ -192,9 +188,7 @@ AC_SUBST(DBUS_SYS_DIR) - *) +@@ -167,8 +163,7 @@ case "${with_bluetooth}" in AC_MSG_CHECKING(for gnome-bluetooth) PKG_CHECK_MODULES(GNOME_BLUETOOTH, -- gnome-bluetooth-1.0 >= 2.27.6 + gnome-bluetooth-1.0 >= 2.27.6 - libnm-util >= 0.9.2 - libnm-glib >= 0.9.2, -+ gnome-bluetooth-1.0 >= 2.27.6, ++ dbus-glib-1, have_gbt=yes, have_gbt=no) ;; esac - -diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am ---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400 -+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400 +Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am +=================================================================== +--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am @@ -1,5 +1,9 @@ bin_PROGRAMS = nm-connection-editor @@ -37,7 +37,7 @@ diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-ed nm_connection_editor_CPPFLAGS = \ $(GTK_CFLAGS) \ $(NMA_CFLAGS) \ -@@ -63,7 +67,10 @@ nm_connection_editor_LDADD = \ +@@ -66,7 +70,10 @@ nm_connection_editor_LDADD = \ ${top_builddir}/src/libnm-gtk/libnm-gtk.la \ $(GTK_LIBS) \ $(NMA_LIBS) \ @@ -49,9 +49,10 @@ diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-ed uidir = $(datadir)/nm-applet ui_DATA = \ -diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am ---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400 -+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am +=================================================================== +--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am @@ -1,5 +1,9 @@ SUBDIRS=. tests @@ -82,9 +83,10 @@ diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la -diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am ---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am.buildfix 2011-03-10 02:19:03.664936744 -0600 -+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am 2011-03-10 02:20:10.784097638 -0600 +Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am +=================================================================== +--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am @@ -1,4 +1,7 @@ -INCLUDES = -I$(top_srcdir)/src/utils +INCLUDES = -I$(top_srcdir)/src/utils \ @@ -94,9 +96,10 @@ diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers noinst_PROGRAMS = test-upgrade -diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am ---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400 -+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400 +Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am +=================================================================== +--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am @@ -6,6 +6,9 @@ INCLUDES = \ -I${top_builddir}/src/marshallers \ -I${top_srcdir}/src/utils \ @@ -107,7 +110,7 @@ diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetoo $(GNOME_BLUETOOTH_CFLAGS) \ $(DISABLE_DEPRECATED) \ $(WARN_CFLAGS) -@@ -14,7 +17,9 @@ plugin_LTLIBRARIES = libnma.la +@@ -25,7 +28,9 @@ libnma_la_LIBADD = \ $(top_builddir)/src/marshallers/libmarshallers.la \ $(top_builddir)/src/utils/libutils.la \ $(top_builddir)/src/libnm-gtk/libnm-gtk.la \ @@ -118,9 +121,10 @@ diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetoo endif EXTRA_DIST = $(BT_WIDGET_SOURCES) -diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am ---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400 -+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am +=================================================================== +--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/Makefile.am ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am @@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper bin_PROGRAMS = nm-applet @@ -132,7 +136,7 @@ diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am.b nm_applet_CPPFLAGS = \ $(GTK_CFLAGS) \ $(NMA_CFLAGS) \ -@@ -54,7 +58,9 @@ nm_applet_LDADD = \ +@@ -72,7 +76,9 @@ nm_applet_LDADD = \ ${top_builddir}/src/utils/libutils.la \ ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ ${top_builddir}/src/wireless-security/libwireless-security.la \ @@ -143,9 +147,10 @@ diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am.b uidir = $(datadir)/nm-applet ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui keyring.png -diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.am ---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 -+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.am +=================================================================== +--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/utils/Makefile.am ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.am @@ -1,5 +1,9 @@ SUBDIRS=. tests @@ -156,18 +161,17 @@ diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefil noinst_LTLIBRARIES = libutils.la libutils_la_SOURCES = \ -@@ -18,4 +22,7 @@ libutils_la_CPPFLAGS = \ - $(DISABLE_DEPRECATED) \ +@@ -17,3 +21,6 @@ libutils_la_CPPFLAGS = \ -I${top_srcdir}/src libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) $(GNOME_KEYRING_LIBS) +libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) $(GNOME_KEYRING_LIBS) \ + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la -+ -diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am ---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 -+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am +=================================================================== +--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am @@ -1,4 +1,7 @@ -INCLUDES = -I$(top_srcdir)/src/utils +INCLUDES = -I$(top_srcdir)/src/utils \ @@ -177,9 +181,10 @@ diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/M noinst_PROGRAMS = test-utils -diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am ---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 -+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400 +Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am +=================================================================== +--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libwireless-security.la @@ -190,7 +195,7 @@ diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-secu libwireless_security_la_SOURCES = \ wireless-security.h \ wireless-security.c \ -@@ -36,7 +40,9 @@ libwireless_security_la_CPPFLAGS = \ +@@ -40,7 +44,9 @@ libwireless_security_la_LIBADD = \ $(GTK_LIBS) \ $(NMA_LIBS) \ $(GCONF_LIBS) \ @@ -201,10 +206,10 @@ diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-secu uidir = $(datadir)/nm-applet ui_DATA = \ - -diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am.blah NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am ---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am.blah 2011-09-19 23:44:41.648498871 -0500 -+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am 2011-09-19 23:45:26.556937440 -0500 +Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am +=================================================================== +--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -225,4 +230,3 @@ diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Mak libnm_gtk_la_LDFLAGS = -Wl,-no-undefined \ -export-symbols-regex '^nma_.*' -