rpms/NetworkManager
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 0.9.3.995 (0.9.4-beta1)

Browse Source
This commit is contained in:
Dan Williams 2012-03-02 15:42:34 -06:00
parent 02c1ba597e
commit 5909613e6c
6 changed files with 117 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
NetworkManager.spec
View File

@ -4,18 +4,24 @@
%define gtk3_version 3.0.1 %define gtk3_version 3.0.1
%define glib2_version 2.24.0 %define glib2_version 2.24.0
%define wireless_tools_version 1:28-0pre9 %define wireless_tools_version 1:28-0pre9
%define libnl_version 1.1 %define libnl3_version 3.2.6
%define ppp_version 2.4.5 %define ppp_version 2.4.5
%define snapshot %{nil} %define snapshot .git20120302
%define applet_snapshot %{nil} %define applet_snapshot .git20120302
%define realversion 0.9.2.0 %define realversion 0.9.3.995
%if 0%{?fedora} < 17
%define systemd_dir /lib/systemd/system
%else
%define systemd_dir %{_prefix}/lib/systemd/system
%endif
Name: NetworkManager Name: NetworkManager
Summary: Network connection manager and user applications Summary: Network connection manager and user applications
Epoch: 1 Epoch: 1
Version: 0.9.2 Version: 0.9.3.995
Release: 4%{snapshot}%{?dist} Release: 0.4%{snapshot}%{?dist}
Group: System Environment/Base Group: System Environment/Base
License: GPLv2+ License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/ URL: http://www.gnome.org/projects/NetworkManager/
@ -45,7 +51,7 @@ Requires: glib2 >= %{glib2_version}
Requires: iproute Requires: iproute
Requires: dhclient >= 12:4.1.0 Requires: dhclient >= 12:4.1.0
Requires: wpa_supplicant >= 1:0.7.3-1 Requires: wpa_supplicant >= 1:0.7.3-1
Requires: libnl >= %{libnl_version} Requires: libnl3 >= %{libnl3_version}
Requires: %{name}-glib = %{epoch}:%{version}-%{release} Requires: %{name}-glib = %{epoch}:%{version}-%{release}
Requires: ppp = %{ppp_version} Requires: ppp = %{ppp_version}
Requires: avahi-autoipd Requires: avahi-autoipd
@ -73,7 +79,7 @@ BuildRequires: gettext-devel
BuildRequires: /usr/bin/autopoint BuildRequires: /usr/bin/autopoint
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: wpa_supplicant BuildRequires: wpa_supplicant
BuildRequires: libnl-devel >= %{libnl_version} BuildRequires: libnl3-devel >= %{libnl3_version}
BuildRequires: libnotify-devel >= 0.4 BuildRequires: libnotify-devel >= 0.4
BuildRequires: perl(XML::Parser) BuildRequires: perl(XML::Parser)
BuildRequires: automake autoconf intltool libtool BuildRequires: automake autoconf intltool libtool
@ -87,11 +93,16 @@ BuildRequires: libudev-devel
BuildRequires: libuuid-devel BuildRequires: libuuid-devel
BuildRequires: libgudev1-devel >= 143 BuildRequires: libgudev1-devel >= 143
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
# No bluetooth on s390 # No wimax or bluetooth on s390
%ifnarch s390 s390x %ifnarch s390 s390x
BuildRequires: wimax-devel
BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1 BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1
%endif %endif
BuildRequires: systemd BuildRequires: systemd systemd-devel
%if 0%{?fedora} < 17
# systemd.pc is in systemd-units for F16 and below
BuildRequires: systemd-units
%endif
BuildRequires: iso-codes-devel BuildRequires: iso-codes-devel
%description %description
@ -101,6 +112,19 @@ It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE devices, and
provides VPN integration with a variety of different VPN services. provides VPN integration with a variety of different VPN services.
%ifnarch s390 s390x
%package wimax
Summary: Intel WiMAX device support for NetworkManager
Group: System Environment/Base
Requires: wimax
Requires: %{name} = %{epoch}:%{version}-%{release}
%description wimax
This package contains NetworkManager support for Intel WiMAX mobile broadband
devices.
%endif
%package devel %package devel
Summary: Libraries and headers for adding NetworkManager support to applications Summary: Libraries and headers for adding NetworkManager support to applications
Group: Development/Libraries Group: Development/Libraries
@ -210,8 +234,11 @@ intltoolize --force
--with-dhcpcd=no \ --with-dhcpcd=no \
--with-crypto=nss \ --with-crypto=nss \
--enable-more-warnings=yes \ --enable-more-warnings=yes \
--enable-wimax=no \ %ifnarch s390 s390x
--enable-wimax=yes \
%endif
--enable-polkit=yes \ --enable-polkit=yes \
--with-session-tracking=systemd \
--with-docs=yes \ --with-docs=yes \
--with-system-ca-path=/etc/pki/tls/certs \ --with-system-ca-path=/etc/pki/tls/certs \
--with-tests=yes \ --with-tests=yes \
@ -355,7 +382,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-,root,root,0755) %defattr(-,root,root,0755)
%doc COPYING NEWS AUTHORS README CONTRIBUTING TODO %doc COPYING NEWS AUTHORS README CONTRIBUTING TODO
%{_sysconfdir}/dbus-1/system.d/NetworkManager.conf %{_sysconfdir}/dbus-1/system.d/org.freedesktop.NetworkManager.conf
%{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf %{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf
%{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf %{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf
%{_sysconfdir}/dbus-1/system.d/nm-dispatcher.conf %{_sysconfdir}/dbus-1/system.d/nm-dispatcher.conf
@ -372,7 +399,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libexecdir}/nm-avahi-autoipd.action %{_libexecdir}/nm-avahi-autoipd.action
%{_libexecdir}/nm-dispatcher.action %{_libexecdir}/nm-dispatcher.action
%dir %{_libdir}/NetworkManager %dir %{_libdir}/NetworkManager
%{_libdir}/NetworkManager/*.so* %{_libdir}/NetworkManager/libnm-settings-plugin*.so
%{_mandir}/man1/* %{_mandir}/man1/*
%{_mandir}/man5/* %{_mandir}/man5/*
%{_mandir}/man8/* %{_mandir}/man8/*
@ -387,10 +414,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/polkit-1/actions/*.policy %{_datadir}/polkit-1/actions/*.policy
/lib/udev/rules.d/*.rules /lib/udev/rules.d/*.rules
# systemd stuff # systemd stuff
/lib/systemd/system/NetworkManager.service %{systemd_dir}/NetworkManager.service
/lib/systemd/system/NetworkManager-wait-online.service %{systemd_dir}/NetworkManager-wait-online.service
%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service %{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
%ifnarch s390 s390x
%files wimax
%defattr(-,root,root,0755)
%{_libdir}/%{name}/libnm-device-plugin-wimax.so
%endif
%files devel %files devel
%defattr(-,root,root,0755) %defattr(-,root,root,0755)
%doc ChangeLog docs/api/html/* %doc ChangeLog docs/api/html/*
@ -434,6 +467,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/libnm-glib/*.h %{_includedir}/libnm-glib/*.h
%{_includedir}/%{name}/nm-setting*.h %{_includedir}/%{name}/nm-setting*.h
%{_includedir}/%{name}/nm-connection.h %{_includedir}/%{name}/nm-connection.h
%{_includedir}/%{name}/nm-utils-enum-types.h
%{_includedir}/%{name}/nm-utils.h %{_includedir}/%{name}/nm-utils.h
%{_libdir}/pkgconfig/libnm-glib.pc %{_libdir}/pkgconfig/libnm-glib.pc
%{_libdir}/pkgconfig/libnm-glib-vpn.pc %{_libdir}/pkgconfig/libnm-glib-vpn.pc
@ -462,6 +496,27 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/libnm-gtk.so %{_libdir}/libnm-gtk.so
%changelog %changelog
* Fri Mar 2 2012 Dan Williams <dcbw@redhat.com> - 0.9.3.995-0.4
- Update to 0.9.3.995 (0.9.4-beta1)
- core: add support for bonding and VLAN interfaces
- core: add support for Internet connectivity detection
- core: add support for IPv6 Privacy Extensions
- core: fix interaction with firewalld restarts
* Thu Mar 1 2012 Dan Horák <dan[at]danny.cz> - 0.9.3-0.3
- disable WiMAX plugin on s390(x)
* Thu Feb 16 2012 Dan Williams <dcbw@redhat.com> - 0.9.3-0.2
- Put WiMAX plugin files in the right subpackage
* Wed Feb 15 2012 Dan Williams <dcbw@redhat.com> - 0.9.3-0.1
- Update to 0.9.4 snapshot
- wimax: enable optional support for Intel WiMAX devices
- core: use nl80211 for WiFi device control
- core: add basic support for Infiniband IP interfaces
- core: add basic support for bonded interfaces
- core: in-process IP configuration no longer blocks connected state
* Thu Jan 19 2012 Matthias Clasen <mclasen@redhat.com> - 0.9.2-4 * Thu Jan 19 2012 Matthias Clasen <mclasen@redhat.com> - 0.9.2-4
- Rebuild - Rebuild

18
applet-ignore-deprecated.patch
View File

@ -1,18 +1,6 @@
diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/m4/compiler_warnings.m4.depre NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/m4/compiler_warnings.m4 diff -up NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/configure.ac.foo NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/configure.ac
--- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/m4/compiler_warnings.m4.depre 2011-11-10 15:03:07.528830185 -0600 --- NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/configure.ac.foo 2011-11-10 15:10:45.268107655 -0600
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/m4/compiler_warnings.m4 2011-11-10 15:05:28.273070638 -0600 +++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/configure.ac 2011-11-10 15:10:51.902024720 -0600
@@ -7,7 +7,7 @@ if test "$GCC" = "yes" -a "$set_more_war
AC_MSG_RESULT(yes)
CFLAGS="-Wall -Werror -std=gnu89 $CFLAGS"
- for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \
+ for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes -Wno-deprecated-declarations -Wno-error=deprecated-declarations \
-Wdeclaration-after-statement -Wstrict-prototypes \
-Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \
-fno-strict-aliasing; do
diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac.foo NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac
--- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac.foo 2011-11-10 15:10:45.268107655 -0600
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac 2011-11-10 15:10:51.902024720 -0600
@@ -179,8 +179,6 @@ dnl @@ -179,8 +179,6 @@ dnl
dnl Compiler flags dnl Compiler flags
dnl dnl

72
nm-applet-internal-buildfixes.patch
View File

@ -1,15 +1,15 @@
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac Index: NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/configure.ac
=================================================================== ===================================================================
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/configure.ac --- NetworkManager-0.9.3.995.orig/network-manager-applet-0.9.3.995/configure.ac
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac +++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/configure.ac
@@ -98,10 +98,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) @@ -98,10 +98,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
PKG_CHECK_MODULES(NMA, PKG_CHECK_MODULES(NMA,
[dbus-glib-1 >= 0.74 [dbus-glib-1 >= 0.74
glib-2.0 >= 2.16 glib-2.0 >= 2.16
- NetworkManager >= 0.9.2 - NetworkManager >= 0.9.3
- libnm-glib >= 0.9.2 - libnm-glib >= 0.9.3
- libnm-util >= 0.9.2 - libnm-util >= 0.9.3
- libnm-glib-vpn >= 0.9.2 - libnm-glib-vpn >= 0.9.3
gmodule-export-2.0]) gmodule-export-2.0])
PKG_CHECK_MODULES(GCONF, [gconf-2.0]) PKG_CHECK_MODULES(GCONF, [gconf-2.0])
@ -17,16 +17,16 @@ Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac
AC_MSG_CHECKING(for gnome-bluetooth) AC_MSG_CHECKING(for gnome-bluetooth)
PKG_CHECK_MODULES(GNOME_BLUETOOTH, PKG_CHECK_MODULES(GNOME_BLUETOOTH,
gnome-bluetooth-1.0 >= 2.27.6 gnome-bluetooth-1.0 >= 2.27.6
- libnm-util >= 0.9.2 - libnm-util >= 0.9.3
- libnm-glib >= 0.9.2, - libnm-glib >= 0.9.3,
+ dbus-glib-1, + dbus-glib-1,
have_gbt=yes, have_gbt=no) have_gbt=yes, have_gbt=no)
;; ;;
esac esac
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am Index: NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/connection-editor/Makefile.am
=================================================================== ===================================================================
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am --- NetworkManager-0.9.3.995.orig/network-manager-applet-0.9.3.995/src/connection-editor/Makefile.am
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am +++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/connection-editor/Makefile.am
@@ -1,5 +1,9 @@ @@ -1,5 +1,9 @@
bin_PROGRAMS = nm-connection-editor bin_PROGRAMS = nm-connection-editor
@ -49,10 +49,10 @@ Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-edit
uidir = $(datadir)/nm-applet uidir = $(datadir)/nm-applet
ui_DATA = \ ui_DATA = \
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am Index: NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/gconf-helpers/Makefile.am
=================================================================== ===================================================================
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am --- NetworkManager-0.9.3.995.orig/network-manager-applet-0.9.3.995/src/gconf-helpers/Makefile.am
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am +++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/gconf-helpers/Makefile.am
@@ -1,5 +1,9 @@ @@ -1,5 +1,9 @@
SUBDIRS=. tests SUBDIRS=. tests
@ -83,10 +83,10 @@ Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/M
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.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 + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am Index: NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/gconf-helpers/tests/Makefile.am
=================================================================== ===================================================================
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am --- NetworkManager-0.9.3.995.orig/network-manager-applet-0.9.3.995/src/gconf-helpers/tests/Makefile.am
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am +++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/gconf-helpers/tests/Makefile.am
@@ -1,4 +1,7 @@ @@ -1,4 +1,7 @@
-INCLUDES = -I$(top_srcdir)/src/utils -INCLUDES = -I$(top_srcdir)/src/utils
+INCLUDES = -I$(top_srcdir)/src/utils \ +INCLUDES = -I$(top_srcdir)/src/utils \
@ -96,10 +96,10 @@ Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/t
noinst_PROGRAMS = test-upgrade noinst_PROGRAMS = test-upgrade
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am Index: NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/gnome-bluetooth/Makefile.am
=================================================================== ===================================================================
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am --- NetworkManager-0.9.3.995.orig/network-manager-applet-0.9.3.995/src/gnome-bluetooth/Makefile.am
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am +++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/gnome-bluetooth/Makefile.am
@@ -6,6 +6,9 @@ INCLUDES = \ @@ -6,6 +6,9 @@ INCLUDES = \
-I${top_builddir}/src/marshallers \ -I${top_builddir}/src/marshallers \
-I${top_srcdir}/src/utils \ -I${top_srcdir}/src/utils \
@ -121,10 +121,10 @@ Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth
endif endif
EXTRA_DIST = $(BT_WIDGET_SOURCES) EXTRA_DIST = $(BT_WIDGET_SOURCES)
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am Index: NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/Makefile.am
=================================================================== ===================================================================
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/Makefile.am --- NetworkManager-0.9.3.995.orig/network-manager-applet-0.9.3.995/src/Makefile.am
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am +++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/Makefile.am
@@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper @@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
bin_PROGRAMS = nm-applet bin_PROGRAMS = nm-applet
@ -147,10 +147,10 @@ Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am
uidir = $(datadir)/nm-applet uidir = $(datadir)/nm-applet
ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui keyring.png ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui keyring.png
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.am Index: NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/utils/Makefile.am
=================================================================== ===================================================================
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/utils/Makefile.am --- NetworkManager-0.9.3.995.orig/network-manager-applet-0.9.3.995/src/utils/Makefile.am
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.am +++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/utils/Makefile.am
@@ -1,5 +1,9 @@ @@ -1,5 +1,9 @@
SUBDIRS=. tests SUBDIRS=. tests
@ -168,10 +168,10 @@ Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.
+libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) $(GNOME_KEYRING_LIBS) \ +libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) $(GNOME_KEYRING_LIBS) \
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.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 + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am Index: NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/utils/tests/Makefile.am
=================================================================== ===================================================================
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am --- NetworkManager-0.9.3.995.orig/network-manager-applet-0.9.3.995/src/utils/tests/Makefile.am
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am +++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/utils/tests/Makefile.am
@@ -1,4 +1,7 @@ @@ -1,4 +1,7 @@
-INCLUDES = -I$(top_srcdir)/src/utils -INCLUDES = -I$(top_srcdir)/src/utils
+INCLUDES = -I$(top_srcdir)/src/utils \ +INCLUDES = -I$(top_srcdir)/src/utils \
@ -181,10 +181,10 @@ Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Mak
noinst_PROGRAMS = test-utils noinst_PROGRAMS = test-utils
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am Index: NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/wireless-security/Makefile.am
=================================================================== ===================================================================
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am --- NetworkManager-0.9.3.995.orig/network-manager-applet-0.9.3.995/src/wireless-security/Makefile.am
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am +++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/wireless-security/Makefile.am
@@ -1,5 +1,9 @@ @@ -1,5 +1,9 @@
noinst_LTLIBRARIES = libwireless-security.la noinst_LTLIBRARIES = libwireless-security.la
@ -206,10 +206,10 @@ Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-securi
uidir = $(datadir)/nm-applet uidir = $(datadir)/nm-applet
ui_DATA = \ ui_DATA = \
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am Index: NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/libnm-gtk/Makefile.am
=================================================================== ===================================================================
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am --- NetworkManager-0.9.3.995.orig/network-manager-applet-0.9.3.995/src/libnm-gtk/Makefile.am
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am +++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/libnm-gtk/Makefile.am
@@ -1,3 +1,7 @@ @@ -1,3 +1,7 @@
+INCLUDES = -I${top_srcdir}/../include \ +INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \ + -I${top_srcdir}/../libnm-util \

6
nm-applet-no-notifications.patch
View File

@ -1,6 +1,6 @@
diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/nm-applet.schemas.in.foo NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/nm-applet.schemas.in diff -up NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/nm-applet.schemas.in.foo NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/nm-applet.schemas.in
--- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700 --- NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700 +++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
<applyto>/apps/nm-applet/disable-connected-notifications</applyto> <applyto>/apps/nm-applet/disable-connected-notifications</applyto>
<owner>nm-applet</owner> <owner>nm-applet</owner>

6
nm-applet-wifi-dialog-ui-fixes.patch
View File

@ -1,7 +1,7 @@
diff --git NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/nm-wireless-dialog.c NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/nm-wireless-dialog.c diff --git NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/libnm-gtk/nm-wireless-dialog.c NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/libnm-gtk/nm-wireless-dialog.c
index 2cd75e0..5ae4764 100644 index 2cd75e0..5ae4764 100644
--- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/nm-wireless-dialog.c --- NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/libnm-gtk/nm-wireless-dialog.c
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/nm-wireless-dialog.c +++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/libnm-gtk/nm-wireless-dialog.c
@@ -1151,24 +1151,28 @@ internal_init (NMAWirelessDialog *self, @@ -1151,24 +1151,28 @@ internal_init (NMAWirelessDialog *self,
tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the wireless network '%s'."), tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the wireless network '%s'."),

4
sources
View File

@ -1,2 +1,2 @@
bc0b00b8a187762d93c50a9706b4c5c3 NetworkManager-0.9.2.0.tar.bz2 b285d53563d09ab684db143a0bb430a6 NetworkManager-0.9.3.995.git20120302.tar.bz2
feaf2c8427d23924dde7de52ff4c5078 network-manager-applet-0.9.2.0.tar.bz2 8c51be14d788851607921a365771bd94 network-manager-applet-0.9.3.995.git20120302.tar.bz2