Fix gnome-common bits in applet configure

This commit is contained in:
Daniel Williams 2007-03-15 20:35:01 +00:00
parent 64f0a2525d
commit 9162306363
2 changed files with 19 additions and 4 deletions

View File

@ -1,5 +1,5 @@
--- NetworkManager-0.6.5/nm-applet-0.6.5/src/Makefile.am.buildfix 2007-02-02 10:53:26.000000000 -0500 --- NetworkManager-0.6.5/nm-applet-0.6.5/src/Makefile.am.buildfix 2007-02-02 10:53:26.000000000 -0500
+++ NetworkManager-0.6.5/nm-applet-0.6.5/src/Makefile.am 2007-02-09 14:13:47.000000000 -0500 +++ NetworkManager-0.6.5/nm-applet-0.6.5/src/Makefile.am 2007-03-15 14:20:32.000000000 -0400
@@ -2,6 +2,9 @@ @@ -2,6 +2,9 @@
bin_PROGRAMS = nm-applet bin_PROGRAMS = nm-applet
@ -27,8 +27,23 @@
$(NULL) $(NULL)
if WITH_NOTIFY if WITH_NOTIFY
--- NetworkManager-0.6.5/nm-applet-0.6.5/configure.ac.buildfix 2007-02-02 16:47:00.000000000 -0500 --- NetworkManager-0.6.5/nm-applet-0.6.5/configure.ac.buildfix 2007-03-15 11:51:49.000000000 -0400
+++ NetworkManager-0.6.5/nm-applet-0.6.5/configure.ac 2007-02-09 14:06:09.000000000 -0500 +++ NetworkManager-0.6.5/nm-applet-0.6.5/configure.ac 2007-03-15 16:33:34.000000000 -0400
@@ -18,10 +18,10 @@
dnl This doesn't depend on gnome support, only on gnome-common, autogen already
dnl uses gnome-autogen
dnl
-GNOME_COMMON_INIT
-GNOME_DEBUG_CHECK
-GNOME_COMPILE_WARNINGS([maximum])
-GNOME_MAINTAINER_MODE_DEFINES
+dnl GNOME_COMMON_INIT
+dnl GNOME_DEBUG_CHECK
+dnl GNOME_COMPILE_WARNINGS([maximum])
+dnl GNOME_MAINTAINER_MODE_DEFINES
dnl
dnl Required headers
@@ -112,10 +112,6 @@ @@ -112,10 +112,6 @@
AC_SUBST(GOBJECT_CFLAGS) AC_SUBST(GOBJECT_CFLAGS)
AC_SUBST(GOBJECT_LIBS) AC_SUBST(GOBJECT_LIBS)

View File

@ -24,7 +24,7 @@ PreReq: chkconfig
Requires: wireless-tools >= %{wireless_tools_version} Requires: wireless-tools >= %{wireless_tools_version}
Requires: dbus >= %{dbus_version} Requires: dbus >= %{dbus_version}
Requires: dbus-glib >= %{dbus_glib_version} Requires: dbus-glib >= %{dbus_glib_version}
Requires: hal >= %{hal_version} Requires: hal >= 0.5.0
Requires: iproute openssl Requires: iproute openssl
Requires: dhcdbd Requires: dhcdbd
Requires: dhclient >= 3.0.2-12 Requires: dhclient >= 3.0.2-12