[network-manager-applet] Initial commit
Daniel Williams
dcbw at fedoraproject.org
Tue Mar 20 02:48:18 UTC 2012
commit 102fe8b5e3044df225e61a141388d53a4cee5c56
Author: Dan Williams <dcbw at redhat.com>
Date: Mon Mar 19 21:48:09 2012 -0500
Initial commit
.gitignore | 1 +
applet-ignore-deprecated.patch | 12 ++
network-manager-applet.spec | 241 ++++++++++++++++++++++++++++++++++
nm-applet-no-notifications.patch | 30 ++++
nm-applet-wifi-dialog-ui-fixes.patch | 36 +++++
sources | 1 +
6 files changed, 321 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..2b4abac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/network-manager-applet-0.9.3.997.git20120319.tar.bz2
diff --git a/applet-ignore-deprecated.patch b/applet-ignore-deprecated.patch
new file mode 100644
index 0000000..fd5f269
--- /dev/null
+++ b/applet-ignore-deprecated.patch
@@ -0,0 +1,12 @@
+diff -up network-manager-applet-0.9.3.997/configure.ac.foo network-manager-applet-0.9.3.997/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.3.997/configure.ac 2011-11-10 15:10:51.902024720 -0600
+@@ -179,8 +179,6 @@ dnl
+ dnl Compiler flags
+ dnl
+ NM_COMPILER_WARNINGS
+-# Use --enable-maintainer-mode to disabled deprecated symbols
+-GNOME_MAINTAINER_MODE_DEFINES
+
+
+ AC_CONFIG_FILES([
diff --git a/network-manager-applet.spec b/network-manager-applet.spec
new file mode 100644
index 0000000..e6df8bc
--- /dev/null
+++ b/network-manager-applet.spec
@@ -0,0 +1,241 @@
+%define gtk3_version 3.0.1
+%define glib2_version 2.24.0
+%define dbus_version 1.4
+%define dbus_glib_version 0.86
+%define nm_version 1:0.9.3.995
+%define obsoletes_ver 1:0.9.3.997-0.7
+
+%define snapshot .git20120319
+%define realversion 0.9.3.997
+
+Name: network-manager-applet
+Summary: A network control and status applet for NetworkManager
+Version: 0.9.3.997
+Release: 1%{snapshot}%{?dist}
+Group: Applications/System
+License: GPLv2+
+URL: http://www.gnome.org/projects/NetworkManager/
+Obsoletes: NetworkManager-gnome <= %{obsoletes_ver}
+
+Source: http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.9/%{name}-%{realversion}%{snapshot}.tar.bz2
+Patch0: nm-applet-no-notifications.patch
+Patch1: nm-applet-wifi-dialog-ui-fixes.patch
+Patch2: applet-ignore-deprecated.patch
+
+Requires: NetworkManager >= %{nm_version}
+Requires: NetworkManager-glib >= %{nm_version}
+Requires: libnm-gtk = %{version}-%{release}
+Requires: dbus >= 1.4
+Requires: dbus-glib >= 0.86
+Requires: libnotify >= 0.4.3
+Requires: gnome-keyring
+Requires: gnome-icon-theme
+Requires: nm-connection-editor = %{version}-%{release}
+BuildRequires: NetworkManager-devel >= %{nm_version}
+BuildRequires: NetworkManager-glib-devel >= %{nm_version}
+BuildRequires: dbus-devel >= %{dbus_version}
+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
+BuildRequires: pkgconfig
+BuildRequires: libnotify-devel >= 0.4
+BuildRequires: automake autoconf intltool libtool
+BuildRequires: gtk-doc
+BuildRequires: desktop-file-utils
+# No bluetooth on s390
+%ifnarch s390 s390x
+BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1
+%endif
+BuildRequires: iso-codes-devel
+
+
+%description
+This package contains a network control and status notification area applet
+for use with NetworkManager.
+
+%package -n nm-connection-editor
+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: gnome-keyring
+Requires: gnome-icon-theme
+Requires(post): /usr/bin/gtk-update-icon-cache
+
+%description -n nm-connection-editor
+This package contains a network configuration editor and Bluetooth modem
+utility for use with NetworkManager.
+
+
+%package -n libnm-gtk
+Summary: Private libraries for NetworkManager GUI support
+Group: Development/Libraries
+Requires: gtk3 >= %{gtk3_version}
+Obsoletes: NetworkManager-gtk <= %{obsoletes_ver}
+
+%description -n libnm-gtk
+This package contains private libraries to be used only by nm-applet,
+nm-connection editor, and the GNOME Control Center.
+
+%package -n libnm-gtk-devel
+Summary: Private header files for NetworkManager GUI support
+Group: Development/Libraries
+Requires: NetworkManager-devel >= %{nm_version}
+Requires: NetworkManager-glib-devel >= %{nm_version}
+Requires: libnm-gtk = %{version}-%{release}
+Requires: gtk3-devel
+Requires: pkgconfig
+
+%description -n libnm-gtk-devel
+This package contains private header and pkg-config files to be used only by
+nm-applet, nm-connection-editor, and the GNOME control center.
+
+
+%prep
+%setup -q -n network-manager-applet-%{realversion}
+
+%patch0 -p1 -b .no-notifications
+%patch1 -p1 -b .applet-wifi-ui
+%patch2 -p1 -b .no-deprecated
+
+%build
+autoreconf -i -f
+intltoolize --force
+%configure \
+ --disable-static \
+ --with-bluetooth \
+ --enable-more-warnings=yes \
+ --with-gtkver=3
+make %{?_smp_mflags}
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
+
+%find_lang nm-applet
+cat nm-applet.lang >> %{name}.lang
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-bluetooth/plugins/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+# validate .desktop and autostart files
+desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-editor.desktop
+
+
+%post -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
+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
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%post -n nm-connection-editor
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun -n nm-connection-editor
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans -n nm-connection-editor
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%files
+%defattr(-,root,root,0755)
+%doc COPYING NEWS AUTHORS README CONTRIBUTING
+%dir %{_datadir}/nm-applet
+%{_bindir}/nm-applet
+%{_datadir}/applications/nm-applet.desktop
+%{_datadir}/nm-applet/wired-8021x.ui
+%{_datadir}/nm-applet/info.ui
+%{_datadir}/nm-applet/gsm-unlock.ui
+%{_datadir}/nm-applet/keyring.png
+%{_datadir}/icons/hicolor/22x22/apps/nm-adhoc.png
+%{_datadir}/icons/hicolor/22x22/apps/nm-mb-roam.png
+%{_datadir}/icons/hicolor/22x22/apps/nm-secure-lock.png
+%{_datadir}/icons/hicolor/22x22/apps/nm-signal-*.png
+%{_datadir}/icons/hicolor/22x22/apps/nm-stage*-connecting*.png
+%{_datadir}/icons/hicolor/22x22/apps/nm-tech-*.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-wwan-tower.png
+%{_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
+# is the RPM that everything else depends on
+%files -n nm-connection-editor -f %{name}.lang
+%dir %{_datadir}/nm-applet
+%{_bindir}/nm-connection-editor
+%{_datadir}/applications/nm-connection-editor.desktop
+%{_datadir}/nm-applet/ce-*.ui
+%{_datadir}/nm-applet/eap-method-*.ui
+%{_datadir}/nm-applet/ws-*.ui
+%{_datadir}/nm-applet/nag-user-dialog.ui
+%{_datadir}/nm-applet/nm-connection-editor.ui
+%{_datadir}/icons/hicolor/*/apps/nm-device-*.*
+%{_datadir}/icons/hicolor/*/apps/nm-no-connection.*
+%{_datadir}/icons/hicolor/16x16/apps/nm-vpn-standalone-lock.png
+%dir %{_datadir}/gnome-vpn-properties
+%ifnarch s390 s390x
+%{_libdir}/gnome-bluetooth/plugins/*
+%endif
+
+%files -n libnm-gtk
+%defattr(-,root,root,0755)
+%{_libdir}/libnm-gtk.so.*
+%dir %{_datadir}/libnm-gtk
+%{_datadir}/libnm-gtk/*.ui
+
+%files -n libnm-gtk-devel
+%defattr(-,root,root,0755)
+%dir %{_includedir}/libnm-gtk
+%{_includedir}/libnm-gtk/*.h
+%{_libdir}/pkgconfig/libnm-gtk.pc
+%{_libdir}/libnm-gtk.so
+
+%changelog
+* Mon Mar 19 2012 Dan Williams <dcbw at redhat.com> - 0.9.3.997-1
+- Initial package split from NetworkManager
+
diff --git a/nm-applet-no-notifications.patch b/nm-applet-no-notifications.patch
new file mode 100644
index 0000000..c852614
--- /dev/null
+++ b/nm-applet-no-notifications.patch
@@ -0,0 +1,30 @@
+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
+--- network-manager-applet-0.9.3.997/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
++++ network-manager-applet-0.9.3.997/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>
+ <type>bool</type>
+- <default>FALSE</default>
++ <default>TRUE</default>
+ <locale name="C">
+ <short>Disable connected notifications</short>
+ <long>
+@@ -20,7 +20,7 @@
+ <applyto>/apps/nm-applet/disable-disconnected-notifications</applyto>
+ <owner>nm-applet</owner>
+ <type>bool</type>
+- <default>FALSE</default>
++ <default>TRUE</default>
+ <locale name="C">
+ <short>Disable disconnected notifications</short>
+ <long>
+@@ -34,7 +34,7 @@
+ <applyto>/apps/nm-applet/suppress-wireless-networks-available</applyto>
+ <owner>nm-applet</owner>
+ <type>bool</type>
+- <default>FALSE</default>
++ <default>TRUE</default>
+ <locale name="C">
+ <short>Suppress networks available notifications</short>
+ <long>
diff --git a/nm-applet-wifi-dialog-ui-fixes.patch b/nm-applet-wifi-dialog-ui-fixes.patch
new file mode 100644
index 0000000..5fe0fcf
--- /dev/null
+++ b/nm-applet-wifi-dialog-ui-fixes.patch
@@ -0,0 +1,36 @@
+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
+index 2cd75e0..5ae4764 100644
+--- 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
+@@ -1151,24 +1151,28 @@ internal_init (NMAWirelessDialog *self,
+
+ tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the wireless network '%s'."),
+ esc_ssid ? esc_ssid : "<unknown>");
+- gtk_window_set_title (GTK_WINDOW (self), _("Wireless Network Authentication Required"));
+ label = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s",
+ _("Authentication required by wireless network"),
+ tmp);
+ g_free (esc_ssid);
+ g_free (tmp);
+ } else if (priv->adhoc_create) {
+- gtk_window_set_title (GTK_WINDOW (self), _("Create New Wireless Network"));
+ label = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s",
+ _("New wireless network"),
+ _("Enter a name for the wireless network you wish to create."));
+ } else {
+- gtk_window_set_title (GTK_WINDOW (self), _("Connect to Hidden Wireless Network"));
+ label = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s",
+ _("Hidden wireless network"),
+ _("Enter the name and security details of the hidden wireless network you wish to connect to."));
+ }
+
++ /* The primary text should always tell the story, not the title. And since
++ * the dialog is always on top, we can skip the taskbar.
++ */
++ gtk_window_set_title (GTK_WINDOW (self), "");
++ gtk_window_set_keep_above (GTK_WINDOW (self), TRUE);
++ gtk_window_set_skip_taskbar_hint (GTK_WINDOW (self), TRUE);
++
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "caption_label"));
+ gtk_label_set_markup (GTK_LABEL (widget), label);
+ g_free (label);
diff --git a/sources b/sources
index e69de29..b6c0920 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+2972e210e48a3e4a7524a2272bc9b96b network-manager-applet-0.9.3.997.git20120319.tar.bz2
More information about the scm-commits
mailing list