From 2669a3e4c0847c4f7aa0c1e6fc5b8484e3bb88a9 Mon Sep 17 00:00:00 2001 From: Rosa Date: Sun, 3 Mar 2013 21:24:51 +0400 Subject: [PATCH] Automatic import for version 0.9.7.0-4.git20121016.fc18 --- .abf.yml | 2 + applet-ignore-deprecated.patch | 12 ++ network-manager-applet.spec | 275 +++++++++++++++++++++++++++ nm-applet-no-notifications.patch | 11 ++ nm-applet-wifi-dialog-ui-fixes.patch | 34 ++++ 5 files changed, 334 insertions(+) create mode 100644 .abf.yml create mode 100644 applet-ignore-deprecated.patch create mode 100644 network-manager-applet.spec create mode 100644 nm-applet-no-notifications.patch create mode 100644 nm-applet-wifi-dialog-ui-fixes.patch diff --git a/.abf.yml b/.abf.yml new file mode 100644 index 0000000..745dfa2 --- /dev/null +++ b/.abf.yml @@ -0,0 +1,2 @@ +sources: + "network-manager-applet-0.9.7.0.git20121016.tar.bz2": 504e00a9b405a8826a5b5c4199b15235461b71e0 diff --git a/applet-ignore-deprecated.patch b/applet-ignore-deprecated.patch new file mode 100644 index 0000000..213b2e9 --- /dev/null +++ b/applet-ignore-deprecated.patch @@ -0,0 +1,12 @@ +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 + 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..c4859cc --- /dev/null +++ b/network-manager-applet.spec @@ -0,0 +1,275 @@ +%define gtk3_version 3.0.1 +%define glib2_version 2.26.0 +%define dbus_version 1.4 +%define dbus_glib_version 0.86 +%define nm_version 1:0.9.7.0 +%define obsoletes_ver 1:0.9.7 + +%define snapshot .git20121016 +%define realversion 0.9.7.0 + +Name: network-manager-applet +Summary: A network control and status applet for NetworkManager +Version: 0.9.7.0 +Release: 4%{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.94 +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 +BuildRequires: libgnome-keyring-devel +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 +BuildRequires: libgudev1-devel >= 147 + + +%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.94 +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} +Requires: mobile-broadband-provider-info >= 0.20090602 +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} +Obsoletes: NetworkManager-gtk-devel < %{obsoletes_ver} +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 + +%post +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%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 || : +glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/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 +glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : + +%posttrans -n nm-connection-editor +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : + +%files +%defattr(-,root,root,0755) +%doc COPYING NEWS AUTHORS README CONTRIBUTING +%dir %{_datadir}/nm-applet +%{_bindir}/nm-applet +%{_libexecdir}/nm-applet-migration-tool +%{_datadir}/applications/nm-applet.desktop +%{_datadir}/nm-applet/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 +%{_datadir}/GConf/gsettings/nm-applet.convert +%{_sysconfdir}/xdg/autostart/nm-applet.desktop + +# 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 +%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml +%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 +%{_libdir}/girepository-1.0/NMGtk-1.0.typelib + +%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 +%{_datadir}/gir-1.0/NMGtk-1.0.gir + +%changelog +* Thu Nov 08 2012 Kalev Lember - 0.9.7.0-4.git20121016 +- Update the versioned obsoletes for the new F17 NM build + +* Tue Oct 16 2012 Jiří Klimeš - 0.9.7.0-3.git20121016 +- Update to git snapshot (git20121016) +- editor: fix a crash when no VPN plugins are installed + +* Thu Oct 4 2012 Dan Winship - 0.9.7.0-3.git20121004 +- Update to git snapshot + +* Wed Sep 12 2012 Jiří Klimeš - 0.9.7.0-3.git20120820 +- move GSettings schema XML to nm-connection-editor rpm (rh #852792) + +* Thu Aug 30 2012 Jiří Klimeš - 0.9.7.0-2.git20120820 +- run glib-compile-schemas in %post scriplet (rh #852792) + +* Tue Aug 21 2012 Dan Winship - 0.9.7.0-1.git20120820 +- Update to 0.9.7.0 snapshot + +* Tue Aug 14 2012 Daniel Drake - 0.9.5.96-2 +- Rebuild for libgnome-bluetooth.so.11 + +* Mon Jul 23 2012 Dan Williams - 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 - 0.9.5.95-3.git20120713 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jul 14 2012 Kalev Lember - 0.9.5.95-2.git20120713 +- Fix the versioned obsoletes + +* Fri Jul 13 2012 Jiří Klimeš - 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š - 0.9.4-4 +- update to git snapshot + +* Wed May 2 2012 Jiří Klimeš - 0.9.4-3 +- update to git snapshot + +* Mon Mar 19 2012 Dan Williams - 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..c228c20 --- /dev/null +++ b/nm-applet-no-notifications.patch @@ -0,0 +1,11 @@ +--- network-manager-applet-0.9.7.0/org.gnome.nm-applet.gschema.xml.in.no-notifications 2012-08-14 08:59:42.000000000 -0400 ++++ network-manager-applet-0.9.7.0/org.gnome.nm-applet.gschema.xml.in 2012-08-20 14:14:00.148731379 -0400 +@@ -17,7 +17,7 @@ + <_description>Set this to true to disable notifications when connecting to or disconnecting from a VPN. + + +- false ++ true + <_summary>Suppress networks available notifications + <_description>Set this to true to disable notifications when Wi-Fi networks are available. + diff --git a/nm-applet-wifi-dialog-ui-fixes.patch b/nm-applet-wifi-dialog-ui-fixes.patch new file mode 100644 index 0000000..e87d0ad --- /dev/null +++ b/nm-applet-wifi-dialog-ui-fixes.patch @@ -0,0 +1,34 @@ +--- network-manager-applet-0.9.7.0/src/libnm-gtk/nm-wifi-dialog.c.applet-wifi-ui 2012-08-14 08:59:42.000000000 -0400 ++++ network-manager-applet-0.9.7.0/src/libnm-gtk/nm-wifi-dialog.c 2012-08-20 14:17:10.059729528 -0400 +@@ -1140,24 +1140,28 @@ + + tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the Wi-Fi network '%s'."), + esc_ssid ? esc_ssid : ""); +- gtk_window_set_title (GTK_WINDOW (self), _("Wi-Fi Network Authentication Required")); + label = g_strdup_printf ("%s\n\n%s", + _("Authentication required by Wi-Fi network"), + tmp); + g_free (esc_ssid); + g_free (tmp); + } else if (priv->adhoc_create) { +- gtk_window_set_title (GTK_WINDOW (self), _("Create New Wi-Fi Network")); + label = g_strdup_printf ("%s\n\n%s", + _("New Wi-Fi network"), + _("Enter a name for the Wi-Fi network you wish to create.")); + } else { +- gtk_window_set_title (GTK_WINDOW (self), _("Connect to Hidden Wi-Fi Network")); + label = g_strdup_printf ("%s\n\n%s", + _("Hidden Wi-Fi network"), + _("Enter the name and security details of the hidden Wi-Fi 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);