rpms/NetworkManager/devel nm-applet-internal-buildfixes.patch, 1.12, 1.13
Daniel Williams
dcbw at fedoraproject.org
Tue Jul 28 17:28:54 UTC 2009
Author: dcbw
Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28000
Modified Files:
nm-applet-internal-buildfixes.patch
Log Message:
hopefully the last build fix
nm-applet-internal-buildfixes.patch:
configure.ac | 8 +-------
src/Makefile.am | 8 +++++++-
src/connection-editor/Makefile.am | 9 ++++++++-
src/gconf-helpers/Makefile.am | 8 +++++++-
src/gnome-bluetooth/Makefile.am | 9 ++++++++-
src/utils/Makefile.am | 9 ++++++++-
src/wireless-security/Makefile.am | 8 +++++++-
7 files changed, 46 insertions(+), 13 deletions(-)
Index: nm-applet-internal-buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- nm-applet-internal-buildfixes.patch 28 Jul 2009 17:23:33 -0000 1.12
+++ nm-applet-internal-buildfixes.patch 28 Jul 2009 17:28:54 -0000 1.13
@@ -70,7 +70,7 @@ diff -up NetworkManager-0.7.995/network-
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
-+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am 2009-07-28 13:23:19.166718483 -0400
++++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
@@ -6,6 +6,9 @@ INCLUDES = \
-DLOCALEDIR="\"$(datadir)/locale\"" \
-I$(top_srcdir)/src/gconf-helpers/ \
@@ -81,6 +81,19 @@ diff -up NetworkManager-0.7.995/network-
$(GNOME_BLUETOOTH_CFLAGS) \
$(WARN_CFLAGS)
+@@ -14,7 +17,11 @@ plugin_LTLIBRARIES = libnma.la
+
+ libnma_la_SOURCES = network-manager-applet.c
+ libnma_la_LDFLAGS = -module -avoid-version
+-libnma_la_LIBADD = $(top_builddir)/src/gconf-helpers/libgconf-helpers.la $(GNOME_BLUETOOTH_LIBS)
++libnma_la_LIBADD = \
++ $(top_builddir)/src/gconf-helpers/libgconf-helpers.la \
++ $(GNOME_BLUETOOTH_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
+ endif
+
+ EXTRA_DIST = network-manager-applet.c
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
More information about the scm-commits
mailing list