From 00002781f7fdbbb5e64e7f0a189f3c588fb7148b Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mon, 17 Nov 2008 23:11:08 +0000 Subject: [PATCH] Really fix fuzz --- NetworkManager.spec | 2 +- ...tch => nm-applet-internal-buildfixes.patch | 22 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) rename NetworkManager-0.6.5-fixup-internal-applet-build.patch => nm-applet-internal-buildfixes.patch (90%) diff --git a/NetworkManager.spec b/NetworkManager.spec index 56e4b32..90a5a80 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -23,7 +23,7 @@ URL: http://www.gnome.org/projects/NetworkManager/ Source: %{name}-%{version}.%{snapshot}.tar.gz Source1: nm-applet-%{version}.%{applet_snapshot}.tar.gz Source2: nm-system-settings.conf -Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch +Patch1: nm-applet-internal-buildfixes.patch Patch2: explain-dns1-dns2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) diff --git a/NetworkManager-0.6.5-fixup-internal-applet-build.patch b/nm-applet-internal-buildfixes.patch similarity index 90% rename from NetworkManager-0.6.5-fixup-internal-applet-build.patch rename to nm-applet-internal-buildfixes.patch index 26bedcc..7535391 100644 --- a/NetworkManager-0.6.5-fixup-internal-applet-build.patch +++ b/nm-applet-internal-buildfixes.patch @@ -1,6 +1,6 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac ---- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2008-06-17 13:51:13.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2008-10-12 08:25:08.000000000 -0400 +--- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2008-11-17 08:37:21.000000000 -0500 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2008-11-17 18:04:35.000000000 -0500 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.72 @@ -13,8 +13,8 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManag libglade-2.0 gmodule-export-2.0 diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2008-08-11 13:40:26.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2008-10-12 08:25:08.000000000 -0400 +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -2,6 +2,10 @@ NULL= bin_PROGRAMS = nm-connection-editor @@ -26,7 +26,7 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am. nm_connection_editor_CPPFLAGS = \ $(NMA_CFLAGS) \ -DICONDIR=\""$(datadir)/icons"\" \ -@@ -63,7 +67,10 @@ nm_connection_editor_LDADD = \ +@@ -64,7 +68,10 @@ nm_connection_editor_LDADD = \ ${top_builddir}/src/wireless-security/libwireless-security.la \ ${top_builddir}/src/utils/libutils.la \ $(NMA_LIBS) \ @@ -37,10 +37,10 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am. + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib_vpn.la if NO_POLKIT_GNOME - nm_connection_editor_CPPFLAGS += \ + nm_connection_editor_LDADD += \ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am --- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2008-10-12 08:25:08.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -59,8 +59,8 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buil + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix 2008-07-03 08:48:24.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2008-10-12 08:25:08.000000000 -0400 +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -4,6 +4,10 @@ NULL= bin_PROGRAMS = nm-applet @@ -85,7 +85,7 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkMa glade_DATA = applet.glade keyring.png diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am --- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am 2008-10-12 08:25:09.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -105,7 +105,7 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix Net + diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am --- NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am 2008-10-12 08:25:09.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libwireless-security.la