diff --git a/.network-manager-applet.metadata b/.network-manager-applet.metadata new file mode 100644 index 0000000..3a7c238 --- /dev/null +++ b/.network-manager-applet.metadata @@ -0,0 +1 @@ +61c227abe9483af9c15c7c13c0008d3d77665ce7 SOURCES/network-manager-applet-0.9.9.0.git20131108.tar.bz2 diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/applet-ignore-deprecated.patch b/SOURCES/applet-ignore-deprecated.patch new file mode 100644 index 0000000..213b2e9 --- /dev/null +++ b/SOURCES/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/SOURCES/nm-applet-no-notifications.patch b/SOURCES/nm-applet-no-notifications.patch new file mode 100644 index 0000000..c228c20 --- /dev/null +++ b/SOURCES/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/SOURCES/nm-applet-wifi-dialog-ui-fixes.patch b/SOURCES/nm-applet-wifi-dialog-ui-fixes.patch new file mode 100644 index 0000000..e87d0ad --- /dev/null +++ b/SOURCES/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); diff --git a/SPECS/network-manager-applet.spec b/SPECS/network-manager-applet.spec new file mode 100644 index 0000000..b60f121 --- /dev/null +++ b/SPECS/network-manager-applet.spec @@ -0,0 +1,343 @@ +%define gtk3_version 3.0.1 +%define glib2_version 2.32.0 +%define dbus_version 1.4 +%define dbus_glib_version 0.86 +%define nm_version 1:0.9.9.0 +%define obsoletes_ver 1:0.9.7 + +%define snapshot .git20131108 +%define realversion 0.9.9.0 + +Name: network-manager-applet +Summary: A network control and status applet for NetworkManager +Version: 0.9.9.0 +Release: 8%{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.100 +Requires: libnotify >= 0.4.3 +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: libsecret-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 +BuildRequires: libsecret-devel >= 0.12 + +%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-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 \ + --disable-migration +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 +%{_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 +%{_mandir}/man1/nm-applet* + +# 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/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 +%{_mandir}/man1/nm-connection-editor* +%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 +* Fri Nov 8 2013 Dan Williams - 0.9.9.0-7.git20131108 +- editor: improve handling of NPAR/SRIOV devices in bonds (rh #804527) +- editor: allow creating bridge masters without slaves + +* Fri Oct 11 2013 Dan Williams - 0.9.9.0-7.git20131011 +- editor: add support for Team devices (rh #1003646) +- editor: don't use deprecated WEP40 and WEP104 values for pairwise (rh #1005171) +- editor: add 'primary' option for bond interfaces (rh #1013727) +- editor: dis-allow IPv6 scopes in DNS server entry (rh #962449) + +* Fri Sep 13 2013 Dan Williams - 0.9.9.0-6.git20130906 +- libnm-gtk: fix for enabling the Apply button for PEAP and TTLS (rh #1000564) +- libnm-gtk: only save CA certificate ignored value when connection is saved +- editor: fix display of VLAN parent interface + +* Fri Sep 06 2013 Dan Williams - 0.9.9.0-5.git20130906 +- editor: fix missing user/password when re-editing a connection (rh #1000564) +- editor: fix handling of missing CA certificate prompts (rh #758076) (rh #809489) +- editor: fix handling of bonding modes (rh #953076) +- applet/editor: add InfiniBand device support (rh #867273) + +* Tue Aug 06 2013 Dennis Gilmore - 0.9.9.0-4.git20130515 +- rebuild for soname bump in gnome-bluetooth + +* Sat Aug 03 2013 Fedora Release Engineering - 0.9.9.0-3.git20130515 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 17 2013 Dan Williams - 0.9.9.0-2 +- Disable migration tool and remove dependencies on GConf and gnome-keyring + +* Wed May 15 2013 Dan Williams - 0.9.9.0-1.git20130515 +- Update to 0.9.10 snapshot + +* Tue Apr 30 2013 Dan Williams - 0.9.8.1-3.git20130430 +- editor: fix possible crash canceling connection edit dialog +- applet: only request secrets from the user when allowed to +- applet: fix signal icons with newer libpng +- applet: fix possible crash getting secrets with libsecret + +* Thu Apr 18 2013 Jiří Klimeš - 0.9.8.1-2.git20130327 +- applet: fix crash while getting a PIN to unlock a modem (rh #950925) + +* Wed Mar 27 2013 Dan Williams - 0.9.8.1-1.git20130327 +- Update to 0.9.8.2 snapshot +- Updated translations +- editor: don't overwrite bridge/bond master interface name with UUID +- applet: fix WWAN PIN dialog invalid "label1" entry widget +- editor: fix allowed values for VLAN ID and MTU +- editor: preserve existing PPP connection LCP echo failure and reply values +- editor: ensure changes to the STP checkbox are saved +- editor: hide BSSID for AdHoc connection (rh #906133) +- editor: fix random data sneaking into IPv6 route gateway fields +- editor: fix handling of initial entry for MAC address widgets + +* Wed Feb 27 2013 Jiří Klimeš - 0.9.8.0-1 +- Update to 0.9.8.0 + +* Fri Feb 8 2013 Dan Williams - 0.9.7.997-1 +- Update to 0.9.7.997 (0.9.8-beta2) +- editor: better handling of gateway entry for IPv4 +- editor: fix some mnemonics (rh #893466) +- editor: fix saving connection when ignoring CA certificate +- editor: enable Bridge connection editing +- editor: hide widgets not relevant for VPN connections + +* Tue Dec 11 2012 Jiří Klimeš - 0.9.7.0-6.git20121211 +- editor: fix populating Firewall zone in 'General' tab + +* Tue Dec 11 2012 Jiří Klimeš - 0.9.7.0-5.git20121211 +- Update to git snapshot (git20121211) without bridges + +* 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 +