[NetworkManager/f15/master] Update to NetworkManager 0.9-beta1
Daniel Williams
dcbw at fedoraproject.org
Tue Mar 8 17:58:48 UTC 2011
commit 0150d5c8ae1742e71008f70c39d4a1e3c396213a
Author: Dan Williams <dcbw at redhat.com>
Date: Tue Mar 8 11:59:31 2011 -0600
Update to NetworkManager 0.9-beta1
NetworkManager.spec | 91 ++++++-------
Port-to-libnotify-070.patch | 44 ------
fix-uninitialized.patch | 45 ------
gtk3-1.patch | 11 --
gtk3-2.patch | 34 -----
gtk3-3.patch | 155 ---------------------
gtk3-4.patch | 34 -----
gtk3-5.patch | 215 -----------------------------
gtk3-6.patch | 12 --
modem-ip-interface-property-change.patch | 27 ----
nm-applet-internal-buildfixes.patch | 97 +++++++-------
nm-applet-no-notifications.patch | 6 +-
nm-applet-no-unused-but-set-warning.patch | 12 --
no-unused-but-set-warning.patch | 12 --
pkauth.patch | 22 ---
sources | 2 -
16 files changed, 96 insertions(+), 723 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 5e3783a..261f423 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -1,15 +1,15 @@
%define dbus_version 1.1
%define dbus_glib_version 0.86-4
-%define gtk2_version 2.18.0
-%define glib2_version 2.16.0
+%define gtk3_version 3.0.1
+%define glib2_version 2.24.0
%define wireless_tools_version 1:28-0pre9
%define libnl_version 1.1
%define ppp_version 2.4.5
-%define snapshot .git20101117
-%define applet_snapshot .git20101117
-%define realversion 0.8.2
+%define snapshot .git20110308
+%define applet_snapshot .git20110308
+%define realversion 0.8.995
%define use_systemd 0
%if 0%{?fedora} >= 15
@@ -19,8 +19,8 @@
Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
-Version: 0.8.2
-Release: 8%{snapshot}%{?dist}
+Version: 0.8.995
+Release: 1%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
@@ -31,27 +31,22 @@ Source2: NetworkManager.conf
Patch1: nm-applet-internal-buildfixes.patch
Patch2: explain-dns1-dns2.patch
Patch3: nm-applet-no-notifications.patch
-Patch4: modem-ip-interface-property-change.patch
-Patch5: no-unused-but-set-warning.patch
-Patch6: fix-uninitialized.patch
-Patch10: Port-to-libnotify-070.patch
-Patch11: gtk3-1.patch
-Patch12: gtk3-2.patch
-Patch13: gtk3-3.patch
-Patch14: gtk3-4.patch
-Patch15: gtk3-5.patch
-Patch16: gtk3-6.patch
-Patch17: nm-applet-no-unused-but-set-warning.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): chkconfig
Requires(preun): chkconfig
+%if %{use_systemd}
+Requires(post): systemctl
+Requires(preun): systemctl
+Requires(postun): systemctl
+%endif
+
Requires: dbus >= %{dbus_version}
Requires: dbus-glib >= %{dbus_glib_version}
Requires: glib2 >= %{glib2_version}
Requires: iproute
Requires: dhclient >= 12:4.1.0
-Requires: wpa_supplicant >= 1:0.6.8-4
+Requires: wpa_supplicant >= 1:0.7.3-1
Requires: libnl >= %{libnl_version}
Requires: %{name}-glib = %{epoch}:%{version}-%{release}
Requires: ppp = %{ppp_version}
@@ -71,10 +66,11 @@ BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: gtk3-devel >= %{gtk3_version}
BuildRequires: libglade2-devel
BuildRequires: GConf2-devel
BuildRequires: gnome-keyring-devel
+BuildRequires: gobject-introspection-devel >= 0.10.3
BuildRequires: gettext-devel
BuildRequires: pkgconfig
BuildRequires: wpa_supplicant
@@ -127,11 +123,11 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-glib = %{epoch}:%{version}-%{release}
Requires: dbus >= %{dbus_version}
Requires: dbus-glib >= %{dbus_glib_version}
-Requires: libnotify >= 0.7.0
+Requires: libnotify >= 0.4.3
Requires: gnome-keyring
Requires: nss >= 3.11.7
Requires: gnome-icon-theme
-Requires(post): gtk2 >= %{gtk2_version}
+Requires(post): /usr/bin/gtk-update-icon-cache
%description gnome
This package contains GNOME utilities and applications for use with
@@ -172,19 +168,6 @@ tar -xjf %{SOURCE1}
%patch1 -p1 -b .buildfix
%patch2 -p1 -b .explain-dns1-dns2
%patch3 -p1 -b .no-notifications
-%patch4 -p1 -b .modem-ip-iface
-%patch5 -p1 -b .no-unused-but-set
-%patch6 -p1 -b .uninitialized
-pushd network-manager-applet-%{realversion}
-%patch10 -p1 -b .libnotify-070
-%patch11 -p1 -b .gtk3-1
-%patch12 -p1 -b .gtk3-2
-%patch13 -p1 -b .gtk3-3
-%patch14 -p1 -b .gtk3-4
-%patch15 -p1 -b .gtk3-5
-%patch16 -p1 -b .gtk3-6
-%patch17 -p1 -b .applet-no-unused-but-set
-popd
%build
@@ -192,7 +175,7 @@ popd
# multilib unhappy due to different timestamps in the generated content
%{__cp} -R docs ORIG-docs
-autoreconf -i -f
+autoreconf -i
%configure \
--disable-static \
--with-distro=redhat \
@@ -200,6 +183,7 @@ autoreconf -i -f
--with-dhcpcd=no \
--with-crypto=nss \
--enable-more-warnings=yes \
+ --enable-wimax=no \
--with-docs=yes \
--with-system-ca-path=/etc/pki/tls/certs \
--with-tests=yes \
@@ -210,13 +194,13 @@ make %{?_smp_mflags}
# build the applet
pushd network-manager-applet-%{realversion}
- autoreconf -i -f
+ autoreconf -i
intltoolize --force
%configure \
--disable-static \
- --with-gtk2=yes \
--with-bluetooth \
- --enable-more-warnings=yes
+ --enable-more-warnings=yes \
+ --with-gtkver=3
make %{?_smp_mflags}
popd
@@ -338,21 +322,21 @@ if [ "$1" -eq 0 ]; then
fi
%post gnome
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
fi
%postun gnome
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+%posttrans gnome
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files -f %{name}.lang
%defattr(-,root,root,0755)
%doc COPYING NEWS AUTHORS README CONTRIBUTING TODO
@@ -396,15 +380,16 @@ fi
%files devel
%defattr(-,root,root,0755)
-%doc ChangeLog docs/spec.html
+%doc ChangeLog docs/api/html/*
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/%{name}.h
%{_includedir}/%{name}/NetworkManagerVPN.h
%{_libdir}/pkgconfig/%{name}.pc
+%dir %{_datadir}/gtk-doc/html/NetworkManager
+%{_datadir}/gtk-doc/html/NetworkManager/*
%files gnome
%defattr(-,root,root,0755)
-%{_sysconfdir}/dbus-1/system.d/nm-applet.conf
%{_bindir}/nm-applet
%{_bindir}/nm-connection-editor
%{_datadir}/applications/*.desktop
@@ -426,6 +411,8 @@ fi
%{_libdir}/libnm-glib.so.*
%{_libdir}/libnm-glib-vpn.so.*
%{_libdir}/libnm-util.so.*
+%{_libdir}/girepository-1.0/NetworkManager-1.0.typelib
+%{_libdir}/girepository-1.0/NMClient-1.0.typelib
%files glib-devel
%defattr(-,root,root,0755)
@@ -438,12 +425,20 @@ fi
%{_libdir}/libnm-glib.so
%{_libdir}/libnm-glib-vpn.so
%{_libdir}/libnm-util.so
+%{_datadir}/gir-1.0/NetworkManager-1.0.gir
+%{_datadir}/gir-1.0/NMClient-1.0.gir
%dir %{_datadir}/gtk-doc/html/libnm-glib
%{_datadir}/gtk-doc/html/libnm-glib/*
%dir %{_datadir}/gtk-doc/html/libnm-util
%{_datadir}/gtk-doc/html/libnm-util/*
%changelog
+* Mon Mar 7 2011 Dan Williams <dcbw at redhat.com> - 0.8.995-1.git20110308
+- Update to NetworkManager 0.9-beta1
+- core: consolidate user and system settings services into NM itself
+- core: add WiMAX support
+- applet: support Fast User Switching
+
* Fri Feb 11 2011 Matthias Clasen <mclasen at redhat.com> - 0.8.2-8.git20101117
- Rebuild against newer gtk
diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch
index f920612..c35b877 100644
--- a/nm-applet-internal-buildfixes.patch
+++ b/nm-applet-internal-buildfixes.patch
@@ -1,32 +1,32 @@
-diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/configure.ac.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/configure.ac
---- NetworkManager-0.8.2/network-manager-applet-0.8.2/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
-+++ NetworkManager-0.8.2/network-manager-applet-0.8.2/configure.ac 2009-07-28 13:11:39.261718877 -0400
+diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/configure.ac.buildfix NetworkManager-0.8.995/network-manager-applet-0.8.995/configure.ac
+--- NetworkManager-0.8.995/network-manager-applet-0.8.995/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
++++ NetworkManager-0.8.995/network-manager-applet-0.8.995/configure.ac 2009-07-28 13:11:39.261718877 -0400
@@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
PKG_CHECK_MODULES(NMA,
[dbus-glib-1 >= 0.74
glib-2.0 >= 2.16
-- NetworkManager >= 0.8.2
-- libnm-glib >= 0.8.2
-- libnm-util >= 0.8.2
-- libnm-glib-vpn >= 0.8.2
- gtk+-2.0 >= 2.14
- libglade-2.0
+- NetworkManager >= 0.8.995
+- libnm-glib >= 0.8.995
+- libnm-util >= 0.8.995
+- libnm-glib-vpn >= 0.8.995
gmodule-export-2.0
+ gconf-2.0
+ gnome-keyring-1
@@ -192,9 +188,7 @@ AC_SUBST(DBUS_SYS_DIR)
AC_MSG_CHECKING(for gnome-bluetooth)
PKG_CHECK_MODULES(GNOME_BLUETOOTH,
gconf-2.0
- gnome-bluetooth-1.0 >= 2.27.6
-- libnm-util >= 0.8.2
-- libnm-glib >= 0.8.2,
+- libnm-util >= 0.8.995
+- libnm-glib >= 0.8.995,
+ gnome-bluetooth-1.0 >= 2.27.6,
have_gbt=yes, have_gbt=no)
;;
esac
-diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/connection-editor/Makefile.am
---- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
-+++ NetworkManager-0.8.2/network-manager-applet-0.8.2/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
+diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.995/network-manager-applet-0.8.995/src/connection-editor/Makefile.am
+--- NetworkManager-0.8.995/network-manager-applet-0.8.995/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
++++ NetworkManager-0.8.995/network-manager-applet-0.8.995/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
@@ -1,5 +1,9 @@
bin_PROGRAMS = nm-connection-editor
@@ -35,11 +35,11 @@ diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/connection-editor
+ -I${top_srcdir}/../libnm-glib
+
nm_connection_editor_CPPFLAGS = \
+ $(GTK_CFLAGS) \
$(NMA_CFLAGS) \
- -DICONDIR=\""$(datadir)/icons"\" \
@@ -63,7 +67,10 @@ nm_connection_editor_LDADD = \
- ${top_builddir}/src/utils/libutils.la \
${top_builddir}/src/marshallers/libmarshallers.la \
+ $(GTK_LIBS) \
$(NMA_LIBS) \
- -lm
+ -lm \
@@ -47,11 +47,11 @@ diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/connection-editor
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la \
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib-vpn.la
- gladedir = $(datadir)/nm-applet
- glade_DATA = \
-diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gconf-helpers/Makefile.am
---- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
-+++ NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+ uidir = $(datadir)/nm-applet
+ ui_DATA = \
+diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.995/network-manager-applet-0.8.995/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.8.995/network-manager-applet-0.8.995/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
++++ NetworkManager-0.8.995/network-manager-applet-0.8.995/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -1,3 +1,7 @@
+INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
@@ -59,19 +59,19 @@ diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gconf-helpers/Mak
+
noinst_LTLIBRARIES = libgconf-helpers.la
- libgconf_helpers_la_SOURCES = \
+ libgconf_helpers_la_SOURCES = \
@@ -19,5 +23,7 @@ libgconf_helpers_la_CPPFLAGS = \
libgconf_helpers_la_LIBADD = \
+ $(GTK_LIBS) \
$(NMA_LIBS) \
- ${top_builddir}/src/marshallers/libmarshallers.la \
- ${top_builddir}/src/utils/libutils.la
+ ${top_builddir}/src/utils/libutils.la \
+ -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.8.2/network-manager-applet-0.8.2/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gnome-bluetooth/Makefile.am
---- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
-+++ NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
+diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.995/network-manager-applet-0.8.995/src/gnome-bluetooth/Makefile.am
+--- NetworkManager-0.8.995/network-manager-applet-0.8.995/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
++++ NetworkManager-0.8.995/network-manager-applet-0.8.995/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
@@ -6,6 +6,9 @@ INCLUDES = \
-I$(top_builddir) \
-I${top_builddir}/src/marshallers \
@@ -83,9 +83,9 @@ diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gnome-bluetooth/M
$(DISABLE_DEPRECATED) \
$(WARN_CFLAGS)
@@ -14,7 +17,9 @@ plugin_LTLIBRARIES = libnma.la
-
libnma_la_LIBADD = \
- $(top_builddir)/src/gconf-helpers/libgconf-helpers.la \
+ $(top_builddir)/src/marshallers/libmarshallers.la \
+ $(top_builddir)/src/utils/libutils.la \
- $(GNOME_BLUETOOTH_LIBS)
+ $(GNOME_BLUETOOTH_LIBS) \
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
@@ -93,9 +93,9 @@ diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gnome-bluetooth/M
endif
EXTRA_DIST = $(BT_WIDGET_SOURCES)
-diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/Makefile.am
---- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
-+++ NetworkManager-0.8.2/network-manager-applet-0.8.2/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/Makefile.am.buildfix NetworkManager-0.8.995/network-manager-applet-0.8.995/src/Makefile.am
+--- NetworkManager-0.8.995/network-manager-applet-0.8.995/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
++++ NetworkManager-0.8.995/network-manager-applet-0.8.995/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
bin_PROGRAMS = nm-applet
@@ -105,8 +105,8 @@ diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/Makefile.am.build
+ -I${top_srcdir}/../libnm-glib
+
nm_applet_CPPFLAGS = \
+ $(GTK_CFLAGS) \
$(NMA_CFLAGS) \
- $(NOTIFY_CFLAGS) \
@@ -54,7 +58,9 @@ nm_applet_LDADD = \
${top_builddir}/src/marshallers/libmarshallers.la \
${top_builddir}/src/utils/libutils.la \
@@ -116,11 +116,11 @@ diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/Makefile.am.build
+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
- gladedir = $(datadir)/nm-applet
- glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/Makefile.am
---- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+ uidir = $(datadir)/nm-applet
+ ui_DATA = applet.ui keyring.png
+diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/utils/Makefile.am.buildfix NetworkManager-0.8.995/network-manager-applet-0.8.995/src/utils/Makefile.am
+--- NetworkManager-0.8.995/network-manager-applet-0.8.995/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.995/network-manager-applet-0.8.995/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -1,5 +1,9 @@
SUBDIRS=. tests
@@ -135,14 +135,14 @@ diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/Makefile.am
-I${top_srcdir}/src/gconf-helpers \
-I${top_srcdir}/src
--libutils_la_LIBADD = $(NMA_LIBS)
-+libutils_la_LIBADD = $(NMA_LIBS) \
+ libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS)
++libutils_la_LIBADD = $(GTK_LIBS) $(NMA_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.8.2/network-manager-applet-0.8.2/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/tests/Makefile.am
---- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.995/network-manager-applet-0.8.995/src/utils/tests/Makefile.am
+--- NetworkManager-0.8.995/network-manager-applet-0.8.995/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.995/network-manager-applet-0.8.995/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -1,4 +1,7 @@
-INCLUDES = -I$(top_srcdir)/src/utils
+INCLUDES = -I$(top_srcdir)/src/utils \
@@ -152,9 +152,9 @@ diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/tests/Makef
noinst_PROGRAMS = test-utils
-diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/wireless-security/Makefile.am
---- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.2/network-manager-applet-0.8.2/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
+diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.995/network-manager-applet-0.8.995/src/wireless-security/Makefile.am
+--- NetworkManager-0.8.995/network-manager-applet-0.8.995/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.995/network-manager-applet-0.8.995/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
@@ -1,5 +1,9 @@
noinst_LTLIBRARIES = libwireless-security.la
@@ -165,8 +165,8 @@ diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/wireless-security
libwireless_security_la_SOURCES = \
wireless-security.h \
wireless-security.c \
-@@ -36,5 +40,7 @@ libwireless_security_la_CPPFLAGS = \
- libwireless_security_la_LIBADD = \
+@@ -36,7 +40,9 @@ libwireless_security_la_CPPFLAGS = \
+ $(GTK_LIBS) \
$(NMA_LIBS) \
${top_builddir}/src/utils/libutils.la \
- ${top_builddir}/src/gconf-helpers/libgconf-helpers.la
@@ -174,3 +174,6 @@ diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/wireless-security
+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
+ uidir = $(datadir)/nm-applet
+ ui_DATA = \
+
diff --git a/nm-applet-no-notifications.patch b/nm-applet-no-notifications.patch
index e076eba..6a10e49 100644
--- a/nm-applet-no-notifications.patch
+++ b/nm-applet-no-notifications.patch
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/nm-applet.schemas.in.foo NetworkManager-0.8.2/network-manager-applet-0.8.2/nm-applet.schemas.in
---- NetworkManager-0.8.2/network-manager-applet-0.8.2/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
-+++ NetworkManager-0.8.2/network-manager-applet-0.8.2/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700
+diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/nm-applet.schemas.in.foo NetworkManager-0.8.995/network-manager-applet-0.8.995/nm-applet.schemas.in
+--- NetworkManager-0.8.995/network-manager-applet-0.8.995/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
++++ NetworkManager-0.8.995/network-manager-applet-0.8.995/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700
@@ -6,7 +6,7 @@
<applyto>/apps/nm-applet/disable-connected-notifications</applyto>
<owner>nm-applet</owner>
diff --git a/sources b/sources
index 012c1b0..e69de29 100644
--- a/sources
+++ b/sources
@@ -1,2 +0,0 @@
-b31e441cdae725192cb98924d91c989e NetworkManager-0.8.2.git20101117.tar.bz2
-021de95fc1e943346ceea28fbaddf45f network-manager-applet-0.8.2.git20101117.tar.bz2
More information about the scm-commits
mailing list