Update to 1.0

This commit is contained in:
Dan Williams 2014-12-22 11:37:42 -06:00
parent b9cb1ccc52
commit 15648ad108
4 changed files with 11 additions and 36 deletions

1
.gitignore vendored
View File

@ -17,3 +17,4 @@
/network-manager-applet-0.9.9.0.git20140123.5d4f17e.tar.bz2 /network-manager-applet-0.9.9.0.git20140123.5d4f17e.tar.bz2
/network-manager-applet-0.9.9.0.git20140424.9ba9c3e.tar.bz2 /network-manager-applet-0.9.9.0.git20140424.9ba9c3e.tar.bz2
/network-manager-applet-0.9.10.1.git20141201.be5a9db.tar.bz2 /network-manager-applet-0.9.10.1.git20141201.be5a9db.tar.bz2
/network-manager-applet-1.0.0.tar.xz

View File

@ -1,27 +0,0 @@
From 00d1e2bcee72857c093a6588f7bceac3b8397809 Mon Sep 17 00:00:00 2001
From: Elad Alfassa <elad@fedoraproject.org>
Date: Thu, 21 Aug 2014 21:32:21 +0300
Subject: [PATCH] connection-editor: Don't show launcher in GNOME
As discussed with aday, control-center will spawn nm-connection-editor when
needed, and therefor we really don't need the launcher shown,
it clutters the Application list.
https://bugzilla.gnome.org/show_bug.cgi?id=682456
---
nm-connection-editor.desktop.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nm-connection-editor.desktop.in b/nm-connection-editor.desktop.in
index 55239d0..4eefa8a 100644
--- a/nm-connection-editor.desktop.in
+++ b/nm-connection-editor.desktop.in
@@ -10,4 +10,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=NetworkManager
X-GNOME-Bugzilla-Component=nm-connection-editor
Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings;
-NotShowIn=KDE;
+NotShowIn=KDE;GNOME;
--
2.1.0

View File

@ -2,27 +2,26 @@
%define glib2_version 2.32.0 %define glib2_version 2.32.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.9.0-26 %define nm_version 1:0.9.9.95
%define obsoletes_ver 1:0.9.7 %define obsoletes_ver 1:0.9.7
%define snapshot .git20141201 %define snapshot %{nil}
%define git_sha .be5a9db %define git_sha %{nil}
%define realversion 0.9.10.1 %define realversion 1.0.0
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.10.1 Version: 1.0.0
Release: 1%{snapshot}%{git_sha}%{?dist} Release: 1%{snapshot}%{git_sha}%{?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/
Obsoletes: NetworkManager-gnome < %{obsoletes_ver} Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
Source: http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.9/%{name}-%{realversion}%{snapshot}%{git_sha}.tar.bz2 Source: https://download.gnome.org/sources/network-manager-applet/1.0/%{name}-%{realversion}%{snapshot}%{git_sha}.tar.xz
Patch0: nm-applet-no-notifications.patch Patch0: nm-applet-no-notifications.patch
Patch1: nm-applet-wifi-dialog-ui-fixes.patch Patch1: nm-applet-wifi-dialog-ui-fixes.patch
Patch2: applet-ignore-deprecated.patch Patch2: applet-ignore-deprecated.patch
Patch3: 0001-connection-editor-Don-t-show-launcher-in-GNOME.patch
Requires: NetworkManager >= %{nm_version} Requires: NetworkManager >= %{nm_version}
Requires: NetworkManager-glib >= %{nm_version} Requires: NetworkManager-glib >= %{nm_version}
@ -101,7 +100,6 @@ nm-applet, nm-connection-editor, and the GNOME control center.
%patch0 -p1 -b .no-notifications %patch0 -p1 -b .no-notifications
%patch1 -p1 -b .applet-wifi-ui %patch1 -p1 -b .applet-wifi-ui
%patch2 -p1 -b .no-deprecated %patch2 -p1 -b .no-deprecated
%patch3 -p1 -b .onlyshowin
%build %build
autoreconf -i -f autoreconf -i -f
@ -215,6 +213,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_datadir}/gir-1.0/NMGtk-1.0.gir %{_datadir}/gir-1.0/NMGtk-1.0.gir
%changelog %changelog
* Mon Dec 22 2014 Dan Williams <dcbw@redhat.com> - 1.0.0-1
- Update to 1.0
* Mon Dec 1 2014 Jiří Klimeš <jklimes@redhat.com> - 0.9.10.1-1.git20141201.be5a9db * Mon Dec 1 2014 Jiří Klimeš <jklimes@redhat.com> - 0.9.10.1-1.git20141201.be5a9db
- update to latest git snapshot of 0.9.10 (git20141201 sha:be5a9db) - update to latest git snapshot of 0.9.10 (git20141201 sha:be5a9db)

View File

@ -1 +1 @@
979ee34eef0b3f57f5d54aeceaa624c1 network-manager-applet-0.9.10.1.git20141201.be5a9db.tar.bz2 29c1ea523584aff7aefb2497d8655fee network-manager-applet-1.0.0.tar.xz