From 3029c8db211639112c21ad0b19139c6f92743917 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 3 Nov 2010 09:55:17 -0400 Subject: [PATCH] build against libnotify 0.7 --- NetworkManager.spec | 6 ++---- gtk-build.patch | 11 ----------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index e523c81..df02b77 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -38,8 +38,7 @@ Patch7: nm-sleep-wake-no-auth.patch Patch8: nm-libnm-glib-prop-set-delay.patch Patch9: nm-preserve-wifi-state.patch Patch10: Port-to-libnotify-070.patch -Patch11: pkauth.patch -Patch12: gtk-build.patch +Patch11: gtk-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): chkconfig @@ -179,8 +178,7 @@ tar -xjf %{SOURCE1} pushd network-manager-applet-%{realversion} %patch10 -p1 -b .libnotify-070 popd -%patch11 -p1 -b .pkauth -%patch12 -p1 -b .gtk-build +%patch11 -p1 -b .gtk-build %build diff --git a/gtk-build.patch b/gtk-build.patch index 7736f16..31feb7a 100644 --- a/gtk-build.patch +++ b/gtk-build.patch @@ -1,14 +1,3 @@ ---- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/nma-bling-spinner.c 2010-06-25 21:46:38.000000000 -0400 -+++ NetworkManager-0.8.1.hacked/network-manager-applet-0.8.1/src/utils/nma-bling-spinner.c 2010-11-02 21:18:06.858180000 -0400 -@@ -154,7 +154,7 @@ - priv->current = 0; - priv->timeout = 0; - -- GTK_WIDGET_SET_FLAGS (GTK_WIDGET (spinner), GTK_NO_WINDOW); -+ gtk_widget_set_has_window (GTK_WIDGET (spinner), FALSE); - } - - static gboolean --- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-dialog.c 2010-07-21 19:01:21.000000000 -0400 +++ NetworkManager-0.8.1.hacked/network-manager-applet-0.8.1/src/wireless-dialog.c 2010-11-02 21:19:46.531180001 -0400 @@ -1069,7 +1069,6 @@