Update to 0.9.6-rc2

This commit is contained in:
Dan Williams 2012-07-23 20:52:56 -05:00
parent 917879f2ed
commit 059c48fd4c
6 changed files with 21 additions and 19 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/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.5.95.git20120713.tar.bz2
/network-manager-applet-0.9.5.96.tar.bz2

View File

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

View File

@ -5,13 +5,13 @@
%define nm_version 1:0.9.5.95
%define obsoletes_ver 1:0.9.5
%define snapshot .git20120713
%define realversion 0.9.5.95
%define snapshot %{nil}
%define realversion 0.9.5.96
Name: network-manager-applet
Summary: A network control and status applet for NetworkManager
Version: 0.9.5.95
Release: 3%{snapshot}%{?dist}
Version: 0.9.5.96
Release: 1%{snapshot}%{?dist}
Group: Applications/System
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
@ -26,7 +26,7 @@ Requires: NetworkManager >= %{nm_version}
Requires: NetworkManager-glib >= %{nm_version}
Requires: libnm-gtk = %{version}-%{release}
Requires: dbus >= 1.4
Requires: dbus-glib >= 0.86
Requires: dbus-glib >= 0.94
Requires: libnotify >= 0.4.3
Requires: gnome-keyring
Requires: gnome-icon-theme
@ -39,11 +39,7 @@ BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk3-devel >= %{gtk3_version}
BuildRequires: GConf2-devel
%if 0%{?fedora} > 16
BuildRequires: libgnome-keyring-devel
%else
BuildRequires: gnome-keyring-devel
%endif
BuildRequires: gobject-introspection-devel >= 0.10.3
BuildRequires: gettext-devel
BuildRequires: /usr/bin/autopoint
@ -68,7 +64,7 @@ Summary: A network connection configuration editor for NetworkManager
Requires: NetworkManager-glib >= %{nm_version}
Requires: libnm-gtk = %{version}-%{release}
Requires: dbus >= 1.4
Requires: dbus-glib >= 0.86
Requires: dbus-glib >= 0.94
Requires: gnome-keyring
Requires: gnome-icon-theme
Requires(post): /usr/bin/gtk-update-icon-cache
@ -223,6 +219,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/libnm-gtk.so
%changelog
* Mon Jul 23 2012 Dan Williams <dcbw@redhat.com> - 0.9.5.96-1
- Update to 0.9.6-rc2
- lib: recognize PKCS#12 files exported from Firefox
- lib: fix some wireless dialog crashes
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.5.95-3.git20120713
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

View File

@ -1,7 +1,7 @@
diff --git a/org.gnome.nm-applet.gschema.xml.in b/org.gnome.nm-applet.gschema.xml.in
index 71b6a29..1a41d0e 100644
--- network-manager-applet-0.9.5.95/org.gnome.nm-applet.gschema.xml.in
+++ network-manager-applet-0.9.5.95/org.gnome.nm-applet.gschema.xml.in
--- network-manager-applet-0.9.5.96/org.gnome.nm-applet.gschema.xml.in
+++ network-manager-applet-0.9.5.96/org.gnome.nm-applet.gschema.xml.in
@@ -2,12 +2,12 @@
<schemalist gettext-domain="nm-applet">
<schema id="org.gnome.nm-applet" path="/org/gnome/nm-applet/">

View File

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

View File

@ -1 +1 @@
748c3745437534859a809439987dbb60 network-manager-applet-0.9.5.95.git20120713.tar.bz2
27d9d0663aadf64a8f449cb88afdc7a5 network-manager-applet-0.9.5.96.tar.bz2