rpms/network-manager-applet
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 0.9.5.95 (0.9.6-rc1) snapshot

Browse Source
This commit is contained in:
Jiří Klimeš 2012-07-13 10:02:24 +02:00
parent d30e01e990
commit b8b06eda40
6 changed files with 54 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/network-manager-applet-0.9.4.0.git20120328.tar.bz2 /network-manager-applet-0.9.4.0.git20120328.tar.bz2
/network-manager-applet-0.9.4.0.git20120502.tar.bz2 /network-manager-applet-0.9.4.0.git20120502.tar.bz2
/network-manager-applet-0.9.4.1.git20120521.tar.bz2 /network-manager-applet-0.9.4.1.git20120521.tar.bz2
/network-manager-applet-0.9.5.95.git20120713.tar.bz2

6
applet-ignore-deprecated.patch
View File

@ -1,6 +1,6 @@
diff -up network-manager-applet-0.9.3.997/configure.ac.foo network-manager-applet-0.9.3.997/configure.ac diff -up network-manager-applet-0.9.5.95/configure.ac.foo network-manager-applet-0.9.5.95/configure.ac
--- network-manager-applet-0.9.3.997/configure.ac.foo 2011-11-10 15:10:45.268107655 -0600 --- network-manager-applet-0.9.5.95/configure.ac.foo 2011-11-10 15:10:45.268107655 -0600
+++ network-manager-applet-0.9.3.997/configure.ac 2011-11-10 15:10:51.902024720 -0600 +++ network-manager-applet-0.9.5.95/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

44
network-manager-applet.spec
View File

@ -2,16 +2,16 @@
%define glib2_version 2.26.0 %define glib2_version 2.26.0
%define dbus_version 1.4 %define dbus_version 1.4
%define dbus_glib_version 0.86 %define dbus_glib_version 0.86
%define nm_version 1:0.9.4-5 %define nm_version 1:0.9.5.95
%define obsoletes_ver 1:0.9.3.997-2 %define obsoletes_ver 1:0.9.3.997-2
%define snapshot .git20120521 %define snapshot .git20120713
%define realversion 0.9.4.1 %define realversion 0.9.5.95
Name: network-manager-applet Name: network-manager-applet
Summary: A network control and status applet for NetworkManager Summary: A network control and status applet for NetworkManager
Version: 0.9.4 Version: 0.9.5.95
Release: 4%{snapshot}%{?dist} Release: 1%{snapshot}%{?dist}
Group: Applications/System Group: Applications/System
License: GPLv2+ License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/ URL: http://www.gnome.org/projects/NetworkManager/
@ -139,37 +139,19 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
%post -n libnm-gtk -p /sbin/ldconfig %post -n libnm-gtk -p /sbin/ldconfig
%postun -n libnm-gtk -p /sbin/ldconfig %postun -n libnm-gtk -p /sbin/ldconfig
%pre
if [ "$1" -gt 1 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
fi
fi
%preun
if [ "$1" -eq 0 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
fi
fi
%post %post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : 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 %postun
if [ $1 -eq 0 ] ; then if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
fi fi
%posttrans %posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
%post -n nm-connection-editor %post -n nm-connection-editor
@ -189,6 +171,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%doc COPYING NEWS AUTHORS README CONTRIBUTING %doc COPYING NEWS AUTHORS README CONTRIBUTING
%dir %{_datadir}/nm-applet %dir %{_datadir}/nm-applet
%{_bindir}/nm-applet %{_bindir}/nm-applet
%{_libexecdir}/nm-applet-migration-tool
%{_datadir}/applications/nm-applet.desktop %{_datadir}/applications/nm-applet.desktop
%{_datadir}/nm-applet/wired-8021x.ui %{_datadir}/nm-applet/wired-8021x.ui
%{_datadir}/nm-applet/info.ui %{_datadir}/nm-applet/info.ui
@ -203,8 +186,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/22x22/apps/nm-vpn-active-lock.png %{_datadir}/icons/hicolor/22x22/apps/nm-vpn-active-lock.png
%{_datadir}/icons/hicolor/22x22/apps/nm-vpn-connecting*.png %{_datadir}/icons/hicolor/22x22/apps/nm-vpn-connecting*.png
%{_datadir}/icons/hicolor/22x22/apps/nm-wwan-tower.png %{_datadir}/icons/hicolor/22x22/apps/nm-wwan-tower.png
%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
%{_datadir}/GConf/gsettings/nm-applet.convert
%{_sysconfdir}/xdg/autostart/nm-applet.desktop %{_sysconfdir}/xdg/autostart/nm-applet.desktop
%{_sysconfdir}/gconf/schemas/nm-applet.schemas
# Yes, lang files for the applet go in nm-connection-editor RPM since it # Yes, lang files for the applet go in nm-connection-editor RPM since it
# is the RPM that everything else depends on # is the RPM that everything else depends on
@ -239,6 +223,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/libnm-gtk.so %{_libdir}/libnm-gtk.so
%changelog %changelog
* Fri Jul 13 2012 Jiří Klimeš <jklimes@redhat.com> - 0.9.5.95-1.git20120713
- update to 0.9.5.95 (0.9.6-rc1) snapshot
- editor: fixed UI mnemonics
- editor: fix defaults for PPP echo values
- applet: various crash and stability fixes
- applet: show IPv6 addressing page for VPN plugins that support it
- applet: port to GSettings and split out 0.8 -> 0.9 migration code into standalone tool
* Mon May 21 2012 Jiří Klimeš <jklimes@redhat.com> - 0.9.4-4 * Mon May 21 2012 Jiří Klimeš <jklimes@redhat.com> - 0.9.4-4
- update to git snapshot - update to git snapshot

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

@ -1,30 +1,28 @@
diff -up network-manager-applet-0.9.3.997/nm-applet.schemas.in.foo network-manager-applet-0.9.3.997/nm-applet.schemas.in diff --git a/org.gnome.nm-applet.gschema.xml.in b/org.gnome.nm-applet.gschema.xml.in
--- network-manager-applet-0.9.3.997/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700 index 71b6a29..1a41d0e 100644
+++ network-manager-applet-0.9.3.997/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700 --- network-manager-applet-0.9.5.95/org.gnome.nm-applet.gschema.xml.in
@@ -6,7 +6,7 @@ +++ network-manager-applet-0.9.5.95/org.gnome.nm-applet.gschema.xml.in
<applyto>/apps/nm-applet/disable-connected-notifications</applyto> @@ -2,12 +2,12 @@
<owner>nm-applet</owner> <schemalist gettext-domain="nm-applet">
<type>bool</type> <schema id="org.gnome.nm-applet" path="/org/gnome/nm-applet/">
- <default>FALSE</default> <key name="disable-connected-notifications" type="b">
+ <default>TRUE</default> - <default>false</default>
<locale name="C"> + <default>true</default>
<short>Disable connected notifications</short> <_summary>Disable connected notifications</_summary>
<long> <_description>Set this to true to disable notifications when connecting to a network.</_description>
@@ -20,7 +20,7 @@ </key>
<applyto>/apps/nm-applet/disable-disconnected-notifications</applyto> <key name="disable-disconnected-notifications" type="b">
<owner>nm-applet</owner> - <default>false</default>
<type>bool</type> + <default>true</default>
- <default>FALSE</default> <_summary>Disable disconnected notifications</_summary>
+ <default>TRUE</default> <_description>Set this to true to disable notifications when disconnecting from a network.</_description>
<locale name="C"> </key>
<short>Disable disconnected notifications</short> @@ -17,7 +17,7 @@
<long> <_description>Set this to true to disable notifications when connecting to or disconnecting from a VPN.</_description>
@@ -34,7 +34,7 @@ </key>
<applyto>/apps/nm-applet/suppress-wireless-networks-available</applyto> <key name="suppress-wireless-networks-available" type="b">
<owner>nm-applet</owner> - <default>false</default>
<type>bool</type> + <default>true</default>
- <default>FALSE</default> <_summary>Suppress networks available notifications</_summary>
+ <default>TRUE</default> <_description>Set this to true to disable notifications when wireless networks are available.</_description>
<locale name="C"> </key>
<short>Suppress networks available notifications</short>
<long>

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

@ -1,7 +1,7 @@
diff --git network-manager-applet-0.9.3.997/src/libnm-gtk/nm-wireless-dialog.c network-manager-applet-0.9.3.997/src/libnm-gtk/nm-wireless-dialog.c diff --git network-manager-applet-0.9.5.95/src/libnm-gtk/nm-wireless-dialog.c network-manager-applet-0.9.5.95/src/libnm-gtk/nm-wireless-dialog.c
index 2cd75e0..5ae4764 100644 index 2cd75e0..5ae4764 100644
--- network-manager-applet-0.9.3.997/src/libnm-gtk/nm-wireless-dialog.c --- network-manager-applet-0.9.5.95/src/libnm-gtk/nm-wireless-dialog.c
+++ network-manager-applet-0.9.3.997/src/libnm-gtk/nm-wireless-dialog.c +++ network-manager-applet-0.9.5.95/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'."),

2
sources
View File

@ -1 +1 @@
0cb3aaaaccd7566c77280661a4721955 network-manager-applet-0.9.4.1.git20120521.tar.bz2 748c3745437534859a809439987dbb60 network-manager-applet-0.9.5.95.git20120713.tar.bz2