Hello community, here is the log from the commit of package NetworkManager-gnome for openSUSE:Factory checked in at 2015-09-08 17:37:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager-gnome (Old) and /work/SRC/openSUSE:Factory/.NetworkManager-gnome.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager-gnome" Changes: -------- New Changes file: --- /dev/null 2015-08-24 19:43:32.284261900 +0200 +++ /work/SRC/openSUSE:Factory/.NetworkManager-gnome.new/NetworkManager-appindicator.changes 2015-09-08 17:38:26.000000000 +0200 @@ -0,0 +1,877 @@ +------------------------------------------------------------------- +Tue Sep 1 10:25:16 UTC 2015 - si...@simotek.net + +- Add dual spec file for building appindicator support +- Add nm-applet-app-indicator.patch: introduce appindicator + support. + +------------------------------------------------------------------- +Tue Sep 1 10:25:16 UTC 2015 - si...@simotek.net + +- Update to version 1.0.6: + + Added option to set MTU of Team devices. + + Added AppData for nm-connection-editor. + + Build fixes. + + Updated Czech, Polish and Hungarian translations. + +------------------------------------------------------------------- +Wed Aug 19 19:52:54 UTC 2015 - dims...@opensuse.org + +- Toggle with_cacert_patch to 1: the patch has been rebased. + +------------------------------------------------------------------- +Wed Jul 15 11:45:35 UTC 2015 - dims...@opensuse.org + +- Update to version 1.0.4: + + Setting MTU for a bond device is now supported. + + Connecting to a wireless network from the NetworkManager applet + no longer results in an attempt to create system-wide + connections. This fixes the ability to connect to a wireless + network for non-privileged user. + + The master interface name is used instead of master connection + UUID for slave connections created with nm-connection-editor. + This fixes compatibility of the ifcfg configuration files with + the legacy network service. + + It is now possible to specify an interface name instead of a + MAC address when editing a connection using + nm-connection-editor. + + The WWAN connections now have IPv6 enabled by default. + + libnm-gtk includes functions for password storage selection, + which eases implementation of password GUI for VPN plugins and + other users. +- Rebase nm-applet-probe-radius-server-cert.patch and + nm-applet-probe-radius-server-cert.patch. +- Toggle with_cacert_patch to 0: the cacert patch is currently + disabled in NetworkManager (boo#938198). + +------------------------------------------------------------------- +Wed May 6 07:58:47 UTC 2015 - dims...@opensuse.org + +- Update to version 1.0.2: + + The applet is no longer started in GNOME 3. + + STP controls are no longer displayed if STP is disabled. + + Improved accessibility for screen reader users. + + Multiple bugs fixed, including crashes. + + Updated translations. + +------------------------------------------------------------------- +Thu Mar 12 10:30:50 UTC 2015 - dims...@opensuse.org + +- Add with_cacert_patch condition. When enabled: + + Add NetworkManager(cacert-patch) Requires + + Apply nm-applet-probe-radius-server-cert.patch + + This needs to be toggled whenever NetworkManager is updated + and the nm-probe-radius-server-cert.patch there is not rebased + yet. + +------------------------------------------------------------------- +Tue Mar 10 03:06:20 UTC 2015 - g...@suse.com + +- Refresh and enable nm-applet-probe-radius-server-cert.patch + +------------------------------------------------------------------- +Tue Jan 27 10:32:47 UTC 2015 - dims...@opensuse.org + +- Update to version 1.0.0: + + Added support for editing Bluetooth mobile broadband + connections. + + Added support for IPv6 mobile broadband connections. + + Allow IPv6-only configuration for more connection types. + + The applet and editor are no longer shown in GNOME 3, which has + its own network indicator and control panel. +- Rebase NetworkManager-gnome-no-firewalld.patch. +- Disable nm-applet-probe-radius-server-cert.patch for now: needs + rebase (possibly only in NetworkManager itself). + +------------------------------------------------------------------- +Tue Sep 30 22:34:01 UTC 2014 - dims...@opensuse.org + +- Add NetworkManager-gnome-no-firewalld.patch: Allow to build + without firewalld integration (which openSUSE does not offer, + boo#897636). +- Pass --without-firewalld to configure, to disable integration. + +------------------------------------------------------------------- +Tue Jul 15 09:51:28 UTC 2014 - g...@suse.com + +- Rebase nm-applet-probe-radius-server-cert.patch. + +------------------------------------------------------------------- +Wed Jul 9 20:29:31 UTC 2014 - dims...@opensuse.org + +- Update to version 0.9.10.0: + + Added controls for IPv6 privacy extensions. + + Added support for VPN hints for new/additional secrets during + connection. + + Added support for Data Center Bridging and FibreChannel over + Ethernet configuration. + + Improved connections to new hidden WiFi networks. + + Allow slaves VLANs/slaves of more device types. + + Added support for changing password flags. + + Passwords/secrets now default to user-agent storage instead of + system-wide storage. + + Added support for editing Team connections. + + Rework CA certificate warnings to be less annoying. +- Rebase nm-applet-private-connection.patch. +- Disable nm-applet-probe-radius-server-cert.patch: needs further + investigation. + +------------------------------------------------------------------- +Fri Apr 25 08:20:46 UTC 2014 - dims...@opensuse.org + +- Update to version 0.9.8.10: + + Fixed the applet to not show the PIN unlock dialog even if the + PIN was saved in the keyring. + + Fixed a GSettings-related warning when using GLib 2.40. + +------------------------------------------------------------------- +Fri Apr 4 12:02:17 UTC 2014 - dims...@opensuse.org + +- Update to version 0.9.8.9: + + Changed the default configuration of WPA Enterprise EAP + certificate lookup to not use the system CA store by default, + since this turns out to be a bad default. + + We no longer try to build the bluetooth widget when using newer + versions of gnome-bluetooth (that no longer support plugins). + + Updated translations. + +------------------------------------------------------------------- +Tue Dec 24 13:00:09 UTC 2013 - dims...@opensuse.org + +- Drop gnome-bluetooth-devel BuildRequires: on GNOME 3.11.x, the + bluetooth widget is no longer supported. + +------------------------------------------------------------------- +Mon Nov 11 18:28:12 UTC 2013 - dims...@opensuse.org + +- Update to version 0.9.8.8: + + nm-applet is now started under GNOME 3 again (but never acts as + a "secret agent" under GNOME Shell). This fixes the lack of + password dialogs in some GNOME-3-based sessions (bgo#709410), + and fixes the lack of a mobile broadband PIN unlock dialog + under GNOME Shell. + + Fixed a warning when closing the VPN import/export dialogs. + + Made nm-applet use g_debug(); set G_MESSAGES_DEBUG=nm-applet to + see logging now. + + Updated translations. + +------------------------------------------------------------------- +Tue Oct 1 10:35:42 UTC 2013 - g...@suse.com + +- Rebase nm-applet-private-connection.patch for 0.9.8.4 + (bnc#751211) +- Add nm-applet-probe-radius-server-cert.patch to probe the + certificate the RADIUS server (bnc#574266) + +------------------------------------------------------------------- +Fri Sep 13 17:20:46 UTC 2013 - dims...@opensuse.org + +- Update to version 0.9.8.4: + + Fix handling of bonding mode and VLAN parent fields in editor. + + Fix crash when failing to read secrets from the keyring. + + nm-applet is no longer autostarted under GNOME. + + Updated translations. + +------------------------------------------------------------------- +Wed Sep 11 17:55:18 UTC 2013 - dims...@opensuse.org + +- Add dbus(org.freedesktop.secrets) Requires (bnc#828387). + +------------------------------------------------------------------- +Fri Jun 21 13:02:30 UTC 2013 - dims...@opensuse.org + +- Update to version 0.9.8.2: + + Conversion from gnome-keyring to libsecret; libsecret is now + required to build. + + Editor no longer overwrites master interface name with the + master UUID. + + Fix crashes when using ModemManager 0.7/0.8. + + Fix allowed values for VLAN ID and MTU in the editor. + + Preserve existing PPP LCP echo failure and interval values. + + Ensure Bridge STP checkbox values are saved. + + Hide BSSID for Wi-Fi Ad-Hoc connections (it's autocreated by + the kernel). + + Ensure IPv6 next-hop/gateway values are sane. + + Fix problems with the MAC address combo box on various pages. + + Only request secrets from the user when allowed to. + + Fix running with GTK+ 2.x. ++++ 680 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.NetworkManager-gnome.new/NetworkManager-appindicator.changes --- /work/SRC/openSUSE:Factory/NetworkManager-gnome/NetworkManager-gnome.changes 2015-08-21 07:38:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.NetworkManager-gnome.new/NetworkManager-gnome.changes 2015-09-08 17:38:26.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Sep 1 10:25:16 UTC 2015 - si...@simotek.net + +- Add dual spec file for building appindicator support +- Add nm-applet-app-indicator.patch: introduce appindicator + support. + +------------------------------------------------------------------- +Tue Sep 1 10:25:16 UTC 2015 - si...@simotek.net + +- Update to version 1.0.6: + + Added option to set MTU of Team devices. + + Added AppData for nm-connection-editor. + + Build fixes. + + Updated Czech, Polish and Hungarian translations. + +------------------------------------------------------------------- Old: ---- network-manager-applet-1.0.4.tar.xz New: ---- NetworkManager-appindicator.changes NetworkManager-appindicator.spec network-manager-applet-1.0.6.tar.xz nm-applet-app-indicator.patch nm-icons-appindicator.tar.gz pre_checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-appindicator.spec ++++++ # # spec file for package NetworkManager-appindicator # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define build_appindicator 1 %define with_cacert_patch 1 # Do not edit this auto generated file! Edit NetworkManager-gnome.spec. Name: NetworkManager-appindicator %define _name NetworkManager-gnome Url: http://www.gnome.org/projects/NetworkManager/ Version: 1.0.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-devel BuildRequires: dbus-1-glib-devel # Needed for patch0 BuildRequires: gnome-common BuildRequires: gobject-introspection-devel BuildRequires: gtk3-devel >= 3.4 BuildRequires: intltool BuildRequires: libnotify-devel BuildRequires: libtool # Needed by patch0 BuildRequires: polkit-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: pkgconfig(NetworkManager) >= 1.0.0 BuildRequires: pkgconfig(gudev-1.0) >= 147 BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libnm-glib) >= 1.0.0 BuildRequires: pkgconfig(libnm-glib-vpn) >= 1.0.0 BuildRequires: pkgconfig(libnm-util) >= 1.0.0 BuildRequires: pkgconfig(libsecret-unstable) BuildRequires: pkgconfig(mm-glib) %if %{build_appindicator} # For some reason Configure wants version 3, but to compile it needs version 1 BuildRequires: pkgconfig(appindicator3-0.1) %endif Summary: GNOME applications for use with NetworkManager License: GPL-2.0+ Group: System/GUI/GNOME Source: http://download.gnome.org/sources/network-manager-applet/1.0/network-manager-applet-%{version}.tar.xz Source1: nm-icons.tar.gz Source2: nm-icons-appindicator.tar.gz # PATCH-FIX-UPSTREAM nm-applet-private-connection.patch bnc#751211 bgo#646187 dims...@opensuse.org -- Create private connections if the user is not authorized. Allows to create wifi connections without root access. Patch under discussion upstream. Patch0: nm-applet-private-connection.patch # PATCH-NEEDS-REBASE nm-applet-probe-radius-server-cert.patch bnc#574266 g...@suse.com -- Probe the RADIUS server certificate (WAS: PATCH-FIX-UPSTREAM) Patch1: nm-applet-probe-radius-server-cert.patch # PATCH-FEATURE-UPSTREAM NetworkManager-gnome-no-firewalld.patch boo#897636 bgo#737687 dims...@opensuse.org -- Allow to disable FirewallD integration Patch2: NetworkManager-gnome-no-firewalld.patch # PATCH-FEATURE-UPSTREAM AppIndicator systray support Patch3: nm-applet-app-indicator.patch Provides: NetworkManager-client Requires: NetworkManager >= 0.9.3 # needed for translated country names Requires: iso-codes # mobile-broadband-provider-info is required for DUN capabilities. The BT plugin crashes without it. Requires: mobile-broadband-provider-info Requires: timezone Requires: dbus(org.freedesktop.secrets) %if %{with_cacert_patch} Requires: NetworkManager(cacert-patch) %endif Recommends: %{_name}-lang %glib2_gsettings_schema_requires %if %{build_appindicator} Conflicts: NetworkManager-gnome %else Conflicts: NetworkManager-appindicator %endif %description This package contains GNOME utilities and applications for use with NetworkManager, including a panel applet for wireless networks. %if !%{build_appindicator} %package -n libnm-gtk0 Summary: NetworkManager Gtk+ dialogs Group: System/Libraries %description -n libnm-gtk0 This library provides GTK+ dialogs for NetworkManager integration. %package -n typelib-1_0-NMGtk-1_0 Summary: NetworkManager Gtk+ dialogs -- Introspection bindings Group: System/Libraries %description -n typelib-1_0-NMGtk-1_0 This library provides GTK+ dialogs for NetworkManager integration provided as introspection bindings. %package -n libnm-gtk-devel Summary: NetworkManager Gtk+ dialogs -- Development Files Group: Development/Libraries/GNOME Requires: libnm-gtk0 = %{version} Requires: typelib-1_0-NMGtk-1_0 = %{version} %description -n libnm-gtk-devel This library provides GTK+ dialogs for NetworkManager integration. %endif %lang_package %prep %setup -q -n network-manager-applet-%{version} -a 1 -a 2 %patch0 -p1 %if %{with_cacert_patch} %patch1 -p1 %endif %patch2 -p1 %if %{build_appindicator} %patch3 -p1 %endif ##translation-update-upstream %build # Needed for patch0 NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-static \ --disable-maintainer-mode \ --disable-migration \ %if %{build_appindicator} --with-appindicator \ %endif --without-firewalld %__make %{?_smp_mflags} %install %makeinstall find %{buildroot}%{_libdir} -name '*.la' -delete -print %suse_update_desktop_file %{buildroot}%{_datadir}/applications/nm-applet.desktop %suse_update_desktop_file %{buildroot}%{_sysconfdir}/xdg/autostart/nm-applet.desktop %suse_update_desktop_file -r nm-connection-editor GTK GNOME System X-SuSE-ServiceConfiguration %if !%{build_appindicator} %find_lang nm-applet %{?no_lang_C} cp -r nm-icons/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/ %else cp -r nm-icons-appindicator/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/ mkdir -p %{buildroot}/%{_docdir}/%{name}/ mv %{buildroot}%{_datadir}/icons/hicolor/COPYING %{buildroot}/%{_docdir}/COPYING.icons mv %{buildroot}%{_datadir}/icons/hicolor/CREDITS %{buildroot}/%{_docdir}/CREDITS.icons # Remove files from packages built in NetworkManager-gnome rm %{buildroot}%{_libdir}/libnm-gtk.so.* rm -r %{buildroot}%{_datadir}/libnm-gtk/ rm %{buildroot}%{_libdir}/girepository-1.0/NMGtk-1.0.typelib rm %{buildroot}%{_datadir}/gir-1.0/NMGtk-1.0.gir rm -r %{buildroot}%{_includedir}/libnm-gtk/ rm %{buildroot}%{_libdir}/libnm-gtk.so rm %{buildroot}%{_libdir}/pkgconfig/libnm-gtk.pc rm -r %{buildroot}%{_datadir}/locale/ %endif %post %glib2_gsettings_schema_post %desktop_database_post %icon_theme_cache_post %postun %glib2_gsettings_schema_postun %desktop_database_postun %icon_theme_cache_postun %if !%{build_appindicator} %post -n libnm-gtk0 -p /sbin/ldconfig %postun -n libnm-gtk0 -p /sbin/ldconfig %endif %files %defattr(-,root,root) %doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING %doc %{_mandir}/man?/nm-*.gz %{_bindir}/nm-applet %{_bindir}/nm-connection-editor %{_datadir}/nm-applet %{_datadir}/appdata/* %{_datadir}/GConf/gsettings/nm-applet.convert %{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/*/apps/*.svg %{_sysconfdir}/xdg/autostart/nm-applet.desktop %{_datadir}/applications/nm-applet.desktop %{_datadir}/applications/nm-connection-editor.desktop %if %{build_appindicator} %{_docdir}/* %{_datadir}/icons/hicolor/*/status/*.png %endif %if !%{build_appindicator} %files -n libnm-gtk0 %defattr(-,root,root) %{_libdir}/libnm-gtk.so.* %{_datadir}/libnm-gtk/ %files -n typelib-1_0-NMGtk-1_0 %defattr(-,root,root) %{_libdir}/girepository-1.0/NMGtk-1.0.typelib %files -n libnm-gtk-devel %defattr(-,root,root) %{_datadir}/gir-1.0/NMGtk-1.0.gir %{_includedir}/libnm-gtk/ %{_libdir}/libnm-gtk.so %{_libdir}/pkgconfig/libnm-gtk.pc %files lang -f nm-applet.lang %endif %changelog ++++++ NetworkManager-gnome.spec ++++++ --- /var/tmp/diff_new_pack.wLikWY/_old 2015-09-08 17:38:30.000000000 +0200 +++ /var/tmp/diff_new_pack.wLikWY/_new 2015-09-08 17:38:30.000000000 +0200 @@ -16,11 +16,14 @@ # +%define build_appindicator 0 + %define with_cacert_patch 1 Name: NetworkManager-gnome +%define _name NetworkManager-gnome Url: http://www.gnome.org/projects/NetworkManager/ -Version: 1.0.4 +Version: 1.0.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-devel @@ -44,17 +47,24 @@ BuildRequires: pkgconfig(libnm-util) >= 1.0.0 BuildRequires: pkgconfig(libsecret-unstable) BuildRequires: pkgconfig(mm-glib) +%if %{build_appindicator} +# For some reason Configure wants version 3, but to compile it needs version 1 +BuildRequires: pkgconfig(appindicator3-0.1) +%endif Summary: GNOME applications for use with NetworkManager License: GPL-2.0+ Group: System/GUI/GNOME Source: http://download.gnome.org/sources/network-manager-applet/1.0/network-manager-applet-%{version}.tar.xz Source1: nm-icons.tar.gz +Source2: nm-icons-appindicator.tar.gz # PATCH-FIX-UPSTREAM nm-applet-private-connection.patch bnc#751211 bgo#646187 dims...@opensuse.org -- Create private connections if the user is not authorized. Allows to create wifi connections without root access. Patch under discussion upstream. Patch0: nm-applet-private-connection.patch # PATCH-NEEDS-REBASE nm-applet-probe-radius-server-cert.patch bnc#574266 g...@suse.com -- Probe the RADIUS server certificate (WAS: PATCH-FIX-UPSTREAM) Patch1: nm-applet-probe-radius-server-cert.patch # PATCH-FEATURE-UPSTREAM NetworkManager-gnome-no-firewalld.patch boo#897636 bgo#737687 dims...@opensuse.org -- Allow to disable FirewallD integration Patch2: NetworkManager-gnome-no-firewalld.patch +# PATCH-FEATURE-UPSTREAM AppIndicator systray support +Patch3: nm-applet-app-indicator.patch Provides: NetworkManager-client Requires: NetworkManager >= 0.9.3 # needed for translated country names @@ -66,13 +76,19 @@ %if %{with_cacert_patch} Requires: NetworkManager(cacert-patch) %endif -Recommends: %{name}-lang +Recommends: %{_name}-lang %glib2_gsettings_schema_requires +%if %{build_appindicator} +Conflicts: NetworkManager-gnome +%else +Conflicts: NetworkManager-appindicator +%endif %description This package contains GNOME utilities and applications for use with NetworkManager, including a panel applet for wireless networks. +%if !%{build_appindicator} %package -n libnm-gtk0 Summary: NetworkManager Gtk+ dialogs Group: System/Libraries @@ -96,15 +112,19 @@ %description -n libnm-gtk-devel This library provides GTK+ dialogs for NetworkManager integration. +%endif %lang_package %prep -%setup -q -n network-manager-applet-%{version} -a 1 +%setup -q -n network-manager-applet-%{version} -a 1 -a 2 %patch0 -p1 %if %{with_cacert_patch} %patch1 -p1 %endif %patch2 -p1 +%if %{build_appindicator} +%patch3 -p1 +%endif ##translation-update-upstream %build @@ -114,6 +134,9 @@ --disable-static \ --disable-maintainer-mode \ --disable-migration \ +%if %{build_appindicator} + --with-appindicator \ +%endif --without-firewalld %__make %{?_smp_mflags} @@ -123,8 +146,28 @@ %suse_update_desktop_file %{buildroot}%{_datadir}/applications/nm-applet.desktop %suse_update_desktop_file %{buildroot}%{_sysconfdir}/xdg/autostart/nm-applet.desktop %suse_update_desktop_file -r nm-connection-editor GTK GNOME System X-SuSE-ServiceConfiguration +%if !%{build_appindicator} %find_lang nm-applet %{?no_lang_C} cp -r nm-icons/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/ +%else +cp -r nm-icons-appindicator/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/ +mkdir -p %{buildroot}/%{_docdir}/%{name}/ +mv %{buildroot}%{_datadir}/icons/hicolor/COPYING %{buildroot}/%{_docdir}/COPYING.icons +mv %{buildroot}%{_datadir}/icons/hicolor/CREDITS %{buildroot}/%{_docdir}/CREDITS.icons + +# Remove files from packages built in NetworkManager-gnome +rm %{buildroot}%{_libdir}/libnm-gtk.so.* +rm -r %{buildroot}%{_datadir}/libnm-gtk/ + +rm %{buildroot}%{_libdir}/girepository-1.0/NMGtk-1.0.typelib + +rm %{buildroot}%{_datadir}/gir-1.0/NMGtk-1.0.gir +rm -r %{buildroot}%{_includedir}/libnm-gtk/ +rm %{buildroot}%{_libdir}/libnm-gtk.so +rm %{buildroot}%{_libdir}/pkgconfig/libnm-gtk.pc + +rm -r %{buildroot}%{_datadir}/locale/ +%endif %post %glib2_gsettings_schema_post @@ -136,9 +179,11 @@ %desktop_database_postun %icon_theme_cache_postun +%if !%{build_appindicator} %post -n libnm-gtk0 -p /sbin/ldconfig %postun -n libnm-gtk0 -p /sbin/ldconfig +%endif %files %defattr(-,root,root) @@ -147,6 +192,7 @@ %{_bindir}/nm-applet %{_bindir}/nm-connection-editor %{_datadir}/nm-applet +%{_datadir}/appdata/* %{_datadir}/GConf/gsettings/nm-applet.convert %{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml %{_datadir}/icons/hicolor/*/apps/*.png @@ -154,7 +200,12 @@ %{_sysconfdir}/xdg/autostart/nm-applet.desktop %{_datadir}/applications/nm-applet.desktop %{_datadir}/applications/nm-connection-editor.desktop +%if %{build_appindicator} +%{_docdir}/* +%{_datadir}/icons/hicolor/*/status/*.png +%endif +%if !%{build_appindicator} %files -n libnm-gtk0 %defattr(-,root,root) %{_libdir}/libnm-gtk.so.* @@ -172,5 +223,6 @@ %{_libdir}/pkgconfig/libnm-gtk.pc %files lang -f nm-applet.lang +%endif %changelog ++++++ network-manager-applet-1.0.4.tar.xz -> network-manager-applet-1.0.6.tar.xz ++++++ ++++ 2290 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/Makefile.am new/network-manager-applet-1.0.6/Makefile.am --- old/network-manager-applet-1.0.4/Makefile.am 2015-02-10 14:45:33.000000000 +0100 +++ new/network-manager-applet-1.0.6/Makefile.am 2015-08-27 17:54:15.000000000 +0200 @@ -24,9 +24,13 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ -schema_in_files = org.gnome.nm-applet.gschema.xml.in -gsettingsschema_DATA = $(schema_in_files:.xml.in=.xml) -@INTLTOOL_XML_NOMERGE_RULE@ +gsettings_SCHEMAS = org.gnome.nm-applet.gschema.xml +@GSETTINGS_RULES@ + +appdatadir = $(datadir)/appdata +appdata_DATA = $(appdata_in_files:.xml.in=.xml) +appdata_in_files = org.gnome.nm-connection-editor.appdata.xml.in +@INTLTOOL_XML_RULE@ convertdir=$(datadir)/GConf/gsettings convert_DATA=nm-applet.convert @@ -34,14 +38,15 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes EXTRA_DIST += \ - $(schema_in_files) \ $(convert_DATA) \ + $(appdata_in_files) \ $(autostart_in_files) \ $(desktop_in_files) CLEANFILES = \ $(autostart_DATA) \ $(desktop_DATA) \ - $(gsettingsschema_DATA) + $(appdata_DATA) \ + $(BUILT_SOURCES) DISTCLEANFILES = intltool-extract intltool-merge intltool-update diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/NEWS new/network-manager-applet-1.0.6/NEWS --- old/network-manager-applet-1.0.4/NEWS 2015-07-14 17:36:31.000000000 +0200 +++ new/network-manager-applet-1.0.6/NEWS 2015-08-27 18:25:00.000000000 +0200 @@ -1,4 +1,19 @@ ======================================================= +network-manager-applet-1.0.6 +Overview of changes since network-manager-applet-1.0.4 +======================================================= + +This is a new stable release of network-manager-applet. Notable changes include: + +* Added option to set MTU of Team devices. + +* Added AppData for nm-connection-editor. + +* Build fixes. + +* Updated Czech, Polish and Hungarian translations. + +======================================================= network-manager-applet-1.0.4 Overview of changes since network-manager-applet-1.0.2 ======================================================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/config.h.in new/network-manager-applet-1.0.6/config.h.in --- old/network-manager-applet-1.0.4/config.h.in 2015-07-14 17:40:18.000000000 +0200 +++ new/network-manager-applet-1.0.6/config.h.in 2015-08-27 18:42:14.000000000 +0200 @@ -64,6 +64,9 @@ */ #undef LT_OBJDIR +/* git commit id of the original source code version */ +#undef NMA_GIT_SHA + /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/configure.ac new/network-manager-applet-1.0.6/configure.ac --- old/network-manager-applet-1.0.4/configure.ac 2015-07-14 17:39:50.000000000 +0200 +++ new/network-manager-applet-1.0.6/configure.ac 2015-08-27 18:25:38.000000000 +0200 @@ -1,6 +1,6 @@ AC_PREREQ([2.63]) AC_INIT([nm-applet], - [1.0.4], + [1.0.6], [https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager], [network-manager-applet]) @@ -25,6 +25,10 @@ LT_PREREQ([2.2.6]) LT_INIT +m4_define([nma_git_sha], [m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])]) +NMA_GIT_SHA=nma_git_sha +AC_DEFINE_UNQUOTED(NMA_GIT_SHA,"$NMA_GIT_SHA",[git commit id of the original source code version]) + dnl dnl Checks for typedefs, structures, and compiler characteristics. dnl @@ -33,7 +37,7 @@ dnl dnl translation support dnl -IT_PROG_INTLTOOL([0.40.0]) +IT_PROG_INTLTOOL([0.50.1]) GETTEXT_PACKAGE=nm-applet AC_SUBST(GETTEXT_PACKAGE) @@ -182,6 +186,7 @@ GOBJECT_INTROSPECTION_CHECK([0.9.6]) GLIB_CONFIG_NMA +GLIB_SETTINGS dnl dnl Compiler flags @@ -216,5 +221,6 @@ man/Makefile man/nm-applet.1 man/nm-connection-editor.1 +org.gnome.nm-applet.gschema.xml ]) AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/m4/compiler_warnings.m4 new/network-manager-applet-1.0.6/m4/compiler_warnings.m4 --- old/network-manager-applet-1.0.4/m4/compiler_warnings.m4 2015-07-02 10:00:37.000000000 +0200 +++ new/network-manager-applet-1.0.6/m4/compiler_warnings.m4 2015-08-27 17:54:15.000000000 +0200 @@ -1,3 +1,24 @@ +dnl Check whether a particular compiler flag works with code provided, +dnl disable it in CFLAGS if the check fails. +AC_DEFUN([NM_COMPILER_WARNING], [ + CFLAGS_SAVED="$CFLAGS" + CFLAGS="$CFLAGS -Werror -W$1" + AC_MSG_CHECKING(whether -W$1 works) + + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[$2]])], [ + AC_MSG_RESULT(yes) + CFLAGS="$CFLAGS_SAVED -W$1" + ],[ + AC_MSG_RESULT(no) + CFLAGS="$CFLAGS_SAVED -Wno-$1" + ]) + ],[ + AC_MSG_RESULT(not supported) + CFLAGS="$CFLAGS_SAVED" + ]) +]) + AC_DEFUN([NM_COMPILER_WARNINGS], [AC_ARG_ENABLE(more-warnings, AS_HELP_STRING([--enable-more-warnings], [Possible values: no/yes/error]), @@ -5,53 +26,80 @@ AC_MSG_CHECKING(for more warnings) if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then AC_MSG_RESULT(yes) - CFLAGS="-Wall -std=gnu89 $CFLAGS" + + dnl This is enabled in clang by default, makes little sense, + dnl and causes the build to abort with -Werror. + CFLAGS_SAVED="$CFLAGS" + CFLAGS="$CFLAGS -Qunused-arguments" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([])], [], CFLAGS="$CFLAGS_SAVED") + unset CFLAGS_SAVED dnl clang only warns about unknown warnings, unless dnl called with "-Werror=unknown-warning-option" dnl Test if the compiler supports that, and if it does dnl attach it to the CFLAGS. - SAVE_CFLAGS="$CFLAGS" - EXTRA_CFLAGS="-Werror=unknown-warning-option" - CFLAGS="$SAVE_CFLAGS $EXTRA_CFLAGS" - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - if test $has_option = no; then - EXTRA_CFLAGS= + NM_COMPILER_WARNING([unknown-warning-option], []) + + CFLAGS_SAVED="$CFLAGS" + CFLAGS_MORE_WARNINGS="-Wall -std=gnu89" + + if test "x$set_more_warnings" = xerror; then + CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS -Werror" fi - CFLAGS="$SAVE_CFLAGS" - unset has_option - unset SAVE_CFLAGS for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \ -Wdeclaration-after-statement -Wformat-security \ - -Wstrict-prototypes \ -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \ + -Wstrict-prototypes \ -fno-strict-aliasing -Wno-unused-but-set-variable \ -Wundef -Wimplicit-function-declaration \ -Wpointer-arith -Winit-self \ -Wmissing-include-dirs -Waggregate-return; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $EXTRA_CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) + dnl GCC 4.4 does not warn when checking for -Wno-* flags (https://gcc.gnu.org/wiki/FAQ#wnowarning) + CFLAGS="$CFLAGS_MORE_WARNINGS $(printf '%s' "$option" | sed 's/^-Wno-/-W/') $CFLAGS_SAVED" + AC_MSG_CHECKING([whether compiler understands $option]) AC_TRY_COMPILE([], [], has_option=yes, has_option=no,) - if test $has_option = no; then - CFLAGS="$SAVE_CFLAGS" - else - CFLAGS="$SAVE_CFLAGS $option" + if test $has_option != no; then + CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS $option" fi AC_MSG_RESULT($has_option) unset has_option - unset SAVE_CFLAGS done unset option - unset EXTRA_CFLAGS - if test "x$set_more_warnings" = xerror; then - CFLAGS="$CFLAGS -Werror" - fi + + CFLAGS="$CFLAGS_SAVED" + unset CFLAGS_SAVED + + dnl Disable warnings triggered by known compiler problems + + dnl https://bugzilla.gnome.org/show_bug.cgi?id=745821 + NM_COMPILER_WARNING([unknown-attributes], [#include <glib.h>]) + + dnl https://bugzilla.gnome.org/show_bug.cgi?id=744473 + NM_COMPILER_WARNING([typedef-redefinition], [#include <gio/gio.h>]) + + dnl https://llvm.org/bugs/show_bug.cgi?id=21614 + NM_COMPILER_WARNING([array-bounds], + [#include <string.h>] + [void f () { strcmp ("something", "0"); }] + ) + + dnl https://llvm.org/bugs/show_bug.cgi?id=22949 + NM_COMPILER_WARNING([parentheses-equality], + [#include <sys/wait.h>] + [void f () { if (WIFCONTINUED(0)) return; }] + ) + + dnl systemd-dhcp's log_internal macro and our handle_warn are sometimes + dnl used in void context,u sometimes in int. Makes clang unhappy. + NM_COMPILER_WARNING([unused-value], + [#define yolo ({ (666 + 666); })] + [int f () { int i = yolo; yolo; return i; }] + ) + + CFLAGS="$CFLAGS_MORE_WARNINGS $CFLAGS" else AC_MSG_RESULT(no) fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/org.gnome.nm-applet.gschema.xml.in new/network-manager-applet-1.0.6/org.gnome.nm-applet.gschema.xml.in --- old/network-manager-applet-1.0.4/org.gnome.nm-applet.gschema.xml.in 2015-02-10 14:45:33.000000000 +0100 +++ new/network-manager-applet-1.0.6/org.gnome.nm-applet.gschema.xml.in 2015-08-27 17:54:15.000000000 +0200 @@ -1,52 +1,52 @@ <?xml version="1.0" encoding="UTF-8"?> -<schemalist gettext-domain="nm-applet"> - <schema id="org.gnome.nm-applet" path="/org/gnome/nm-applet/"> +<schemalist> + <schema id="org.gnome.nm-applet" path="/org/gnome/nm-applet/" gettext-domain="@GETTEXT_PACKAGE@"> <key name="disable-connected-notifications" type="b"> <default>false</default> - <_summary>Disable connected notifications</_summary> - <_description>Set this to true to disable notifications when connecting to a network.</_description> + <summary>Disable connected notifications</summary> + <description>Set this to true to disable notifications when connecting to a network.</description> </key> <key name="disable-disconnected-notifications" type="b"> <default>false</default> - <_summary>Disable disconnected notifications</_summary> - <_description>Set this to true to disable notifications when disconnecting from a network.</_description> + <summary>Disable disconnected notifications</summary> + <description>Set this to true to disable notifications when disconnecting from a network.</description> </key> <key name="disable-vpn-notifications" type="b"> <default>false</default> - <_summary>Disable VPN notifications</_summary> - <_description>Set this to true to disable notifications when connecting to or disconnecting from a VPN.</_description> + <summary>Disable VPN notifications</summary> + <description>Set this to true to disable notifications when connecting to or disconnecting from a VPN.</description> </key> <key name="suppress-wireless-networks-available" type="b"> <default>false</default> - <_summary>Suppress networks available notifications</_summary> - <_description>Set this to true to disable notifications when Wi-Fi networks are available.</_description> + <summary>Suppress networks available notifications</summary> + <description>Set this to true to disable notifications when Wi-Fi networks are available.</description> </key> <key name="stamp" type="i"> <default>0</default> - <_summary>Stamp</_summary> - <_description>Used to determine whether settings should be migrated to a new version.</_description> + <summary>Stamp</summary> + <description>Used to determine whether settings should be migrated to a new version.</description> </key> <key name="disable-wifi-create" type="b"> <default>false</default> - <_summary>Disable WiFi Create</_summary> - <_description>Set to true to disable creation of adhoc networks when using the applet.</_description> + <summary>Disable WiFi Create</summary> + <description>Set to true to disable creation of adhoc networks when using the applet.</description> </key> <key name="show-applet" type="b"> <default>true</default> - <_summary>Show the applet in notification area</_summary> - <_description>Set to FALSE to disable displaying the applet in the notification area.</_description> + <summary>Show the applet in notification area</summary> + <description>Set to FALSE to disable displaying the applet in the notification area.</description> </key> </schema> <schema id="org.gnome.nm-applet.eap"> <key name="ignore-ca-cert" type="b"> <default>false</default> - <_summary>Ignore CA certificate</_summary> - <_description>Set this to true to disable warnings about CA certificates in EAP authentication.</_description> + <summary>Ignore CA certificate</summary> + <description>Set this to true to disable warnings about CA certificates in EAP authentication.</description> </key> <key name="ignore-phase2-ca-cert" type="b"> <default>false</default> - <_summary>Ignore CA certificate</_summary> - <_description>Set this to true to disable warnings about CA certificates in phase 2 of EAP authentication.</_description> + <summary>Ignore CA certificate</summary> + <description>Set this to true to disable warnings about CA certificates in phase 2 of EAP authentication.</description> </key> </schema> </schemalist> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/org.gnome.nm-connection-editor.appdata.xml.in new/network-manager-applet-1.0.6/org.gnome.nm-connection-editor.appdata.xml.in --- old/network-manager-applet-1.0.4/org.gnome.nm-connection-editor.appdata.xml.in 1970-01-01 01:00:00.000000000 +0100 +++ new/network-manager-applet-1.0.6/org.gnome.nm-connection-editor.appdata.xml.in 2015-08-27 17:54:15.000000000 +0200 @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright 2015 Ethirajan D <ethiraj...@cdac.in> --> +<application> + <id type="desktop">nm-connection-editor.desktop</id> + <metadata_license>CC0-1.0</metadata_license> + <_name>NetworkManager</_name> + <_summary>NetworkManager for GNOME</_summary> + <description> + <_p>NetworkManager is a system service for managing and configuring your network connections and devices.</_p> + <_p>The nm-connection-editor program works with NetworkManager to create and edit existing connection profiles for NetworkManager.</_p> + </description> + <url type="homepage">https://wiki.gnome.org/Projects/NetworkManager</url> + <screenshots> + <screenshot type="default">https://git.gnome.org/browse/network-manager-applet/plain/data/network-connection-editor.png</screenshot> + </screenshots> + <project_group>GNOME</project_group> + <updatecontact>networkmanager-ma...@gnome.bugs</updatecontact> +</application> + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/po/POTFILES.in new/network-manager-applet-1.0.6/po/POTFILES.in --- old/network-manager-applet-1.0.4/po/POTFILES.in 2015-07-02 10:00:37.000000000 +0200 +++ new/network-manager-applet-1.0.6/po/POTFILES.in 2015-08-27 17:54:15.000000000 +0200 @@ -3,7 +3,8 @@ # Please keep this file sorted alphabetically. nm-applet.desktop.in nm-connection-editor.desktop.in -org.gnome.nm-applet.gschema.xml.in +[type: gettext/gsettings]org.gnome.nm-applet.gschema.xml.in +org.gnome.nm-connection-editor.appdata.xml.in [type: gettext/glade]src/8021x.ui src/applet.c src/applet-device-bond.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/po/cs.po new/network-manager-applet-1.0.6/po/cs.po --- old/network-manager-applet-1.0.4/po/cs.po 2015-07-02 10:00:37.000000000 +0200 +++ new/network-manager-applet-1.0.6/po/cs.po 2015-08-27 17:54:15.000000000 +0200 @@ -15,8 +15,8 @@ "Project-Id-Version: network-manager-applet nm-1.0\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n" -"POT-Creation-Date: 2015-06-19 23:02+0000\n" -"PO-Revision-Date: 2015-06-18 10:23+0100\n" +"POT-Creation-Date: 2015-07-21 23:06+0000\n" +"PO-Revision-Date: 2015-07-22 17:32+0100\n" "Last-Translator: Zdeněk Hataš <zdenek.ha...@gmail.com>\n" "Language-Team: Czech <gnome-cs-l...@gnome.org>\n" "Language: cs\n" @@ -441,7 +441,7 @@ msgstr "Je vyžadováno ověření uživatele k připojení „%s“…" #: ../src/applet.c:2807 ../src/applet-device-bt.c:137 -#: ../src/applet-device-wimax.c:446 ../src/mobile-helpers.c:602 +#: ../src/applet-device-wimax.c:446 ../src/mobile-helpers.c:601 #, c-format msgid "Requesting a network address for '%s'..." msgstr "Žádá se o síťovou adresu pro „%s“…" @@ -607,25 +607,25 @@ msgstr "Jste právě připojeni k mobilní širokopásmové síti." #: ../src/applet-device-bt.c:128 ../src/applet-device-wimax.c:437 -#: ../src/mobile-helpers.c:593 +#: ../src/mobile-helpers.c:592 #, c-format msgid "Preparing mobile broadband connection '%s'..." msgstr "Připravuje se mobilní širokopásmové připojení „%s“…" #: ../src/applet-device-bt.c:131 ../src/applet-device-wimax.c:440 -#: ../src/mobile-helpers.c:596 +#: ../src/mobile-helpers.c:595 #, c-format msgid "Configuring mobile broadband connection '%s'..." msgstr "Nastavuje se mobilní širokopásmové připojení „%s“…" #: ../src/applet-device-bt.c:134 ../src/applet-device-wimax.c:443 -#: ../src/mobile-helpers.c:599 +#: ../src/mobile-helpers.c:598 #, c-format msgid "User authentication required for mobile broadband connection '%s'..." msgstr "" "Je vyžadováno ověření uživatele pro mobilní širokopásmové připojení „%s“…" -#: ../src/applet-device-bt.c:141 ../src/mobile-helpers.c:618 +#: ../src/applet-device-bt.c:141 ../src/mobile-helpers.c:617 #, c-format msgid "Mobile broadband connection '%s' active" msgstr "Mobilní širokopásmové připojení „%s“ je aktivní" @@ -918,12 +918,12 @@ msgid "You are now connected to the WiMAX network." msgstr "Jste právě připojeni k síti WiMAX." -#: ../src/applet-device-wimax.c:455 ../src/mobile-helpers.c:613 +#: ../src/applet-device-wimax.c:455 ../src/mobile-helpers.c:612 #, c-format msgid "Mobile broadband connection '%s' active: (%d%%%s%s)" msgstr "Aktivní mobilní širokopásmové připojení „%s“: (%d%%%s%s)" -#: ../src/applet-device-wimax.c:458 ../src/mobile-helpers.c:616 +#: ../src/applet-device-wimax.c:458 ../src/mobile-helpers.c:615 msgid "roaming" msgstr "roaming" @@ -1667,7 +1667,7 @@ #: ../src/connection-editor/ce-page-dsl.ui.h:3 #: ../src/wireless-security/eap-method-leap.ui.h:3 -#: ../src/wireless-security/eap-method-simple.ui.h:4 +#: ../src/wireless-security/eap-method-simple.ui.h:3 #: ../src/wireless-security/eap-method-tls.ui.h:7 #: ../src/wireless-security/ws-leap.ui.h:3 #: ../src/wireless-security/ws-wpa-psk.ui.h:3 @@ -1676,7 +1676,7 @@ #: ../src/connection-editor/ce-page-dsl.ui.h:4 #: ../src/connection-editor/ce-page-mobile.ui.h:4 -#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95 +#: ../src/libnm-gtk/nm-vpn-password-dialog.c:100 #: ../src/wireless-security/eap-method-leap.ui.h:2 #: ../src/wireless-security/eap-method-simple.ui.h:2 #: ../src/wireless-security/ws-leap.ui.h:2 @@ -2719,11 +2719,11 @@ msgstr "Nepodporovaný typ mobilního širokopásmového připojení." #. Fall back to just asking for GSM vs. CDMA -#: ../src/connection-editor/page-mobile.c:556 +#: ../src/connection-editor/page-mobile.c:539 msgid "Select Mobile Broadband Provider Type" msgstr "Vybrat typ poskytovatele mobilního připojení" -#: ../src/connection-editor/page-mobile.c:583 +#: ../src/connection-editor/page-mobile.c:566 msgid "" "Select the technology your mobile broadband provider uses. If you are " "unsure, ask your provider." @@ -2731,24 +2731,24 @@ "Vyberte technologii, kterou používá váš poskytovatel mobilního připojení. " "Pokud si nejste jistí, obraťte se na svého poskytovatele." -#: ../src/connection-editor/page-mobile.c:588 +#: ../src/connection-editor/page-mobile.c:571 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)" msgstr "" "Můj poskytovatel používá technologii založenou na _GSM (tj. GPRS, EDGE, " "UTMS, HSDPA)" -#: ../src/connection-editor/page-mobile.c:595 +#: ../src/connection-editor/page-mobile.c:578 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)" msgstr "" "Můj poskytovatel používá technologii založenou na C_DMA (tj. 1xRTT, EVDO)" -#: ../src/connection-editor/page-mobile.c:605 ../src/mb-menu-item.c:54 -#: ../src/mobile-helpers.c:280 +#: ../src/connection-editor/page-mobile.c:588 ../src/mb-menu-item.c:54 +#: ../src/mobile-helpers.c:279 msgid "CDMA" msgstr "CDMA" -#: ../src/connection-editor/page-mobile.c:608 ../src/mb-menu-item.c:58 -#: ../src/mobile-helpers.c:278 +#: ../src/connection-editor/page-mobile.c:591 ../src/mb-menu-item.c:58 +#: ../src/mobile-helpers.c:277 msgid "GSM" msgstr "GSM" @@ -3313,6 +3313,22 @@ msgid "%s %s" msgstr "%s %s" +#: ../src/libnm-gtk/nm-ui-utils.c:620 +msgid "Store the password only for this _user" +msgstr "Ukládat hesla pouze pro tohoto _uživatele" + +#: ../src/libnm-gtk/nm-ui-utils.c:621 +msgid "Store the password for _all users" +msgstr "Ukládat hesl_a pro všechny uživatele" + +#: ../src/libnm-gtk/nm-ui-utils.c:622 +msgid "As_k for this password every time" +msgstr "Vždy se dotazovat na _heslo" + +#: ../src/libnm-gtk/nm-ui-utils.c:623 +msgid "The password is _not required" +msgstr "Heslo _není vyžadováno" + #: ../src/libnm-gtk/nm-wifi-dialog.c:441 msgid "New..." msgstr "Nová…" @@ -3369,11 +3385,15 @@ "Zadejte název a podrobnosti o zabezpečení skryté sítě Wi-Fi, ke které se " "chcete připojit." -#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97 +#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102 msgid "_Secondary Password:" msgstr "_Sekundární heslo:" -#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236 +#: ../src/libnm-gtk/nm-vpn-password-dialog.c:105 +msgid "_Ternary Password:" +msgstr "_Terciální heslo:" + +#: ../src/libnm-gtk/nm-vpn-password-dialog.c:250 msgid "Sh_ow passwords" msgstr "Z_obrazit hesla" @@ -3490,16 +3510,16 @@ msgid "Roaming network" msgstr "Roaming síť" -#: ../src/mobile-helpers.c:328 +#: ../src/mobile-helpers.c:327 #, c-format msgid "PIN code for SIM card '%s' on '%s'" msgstr "Kód PIN pro kartu SIM „%s“ na „%s“" -#: ../src/mobile-helpers.c:461 +#: ../src/mobile-helpers.c:460 msgid "PIN code required" msgstr "Požadován kód PIN" -#: ../src/mobile-helpers.c:469 +#: ../src/mobile-helpers.c:468 msgid "PIN code is needed for the mobile broadband device" msgstr "Pro mobilní širokopásmové zařízení je vyžadován kód PIN" @@ -3509,14 +3529,6 @@ msgid "%s connection" msgstr "Připojení %s" -#: ../src/utils/utils.c:379 -msgid "Store the password only for this _user" -msgstr "Ukládat hesla pouze pro tohoto _uživatele" - -#: ../src/utils/utils.c:381 -msgid "Store the password for _all users" -msgstr "Ukládat hesl_a pro všechny uživatele" - #: ../src/wireless-security/eap-method.c:440 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" msgstr "Soukromé klíče DER, PEM nebo PKCS#12 (*.der, *.pem, *.p12, *.key)" @@ -3582,7 +3594,7 @@ msgstr "MD5" #: ../src/wireless-security/eap-method-peap.c:378 -#: ../src/wireless-security/eap-method-tls.c:461 +#: ../src/wireless-security/eap-method-tls.c:468 #: ../src/wireless-security/eap-method-ttls.c:409 msgid "Choose a Certificate Authority certificate..." msgstr "Vyberte certifikát certifikační autority…" @@ -3611,15 +3623,11 @@ msgid "PEAP _version:" msgstr "Verze _PEAP:" -#: ../src/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "Vždy se dotazovat na _heslo" - -#: ../src/wireless-security/eap-method-tls.c:276 +#: ../src/wireless-security/eap-method-tls.c:283 msgid "Unencrypted private keys are insecure" msgstr "Nešifrované soukormé klíče nejsou bezpečné" -#: ../src/wireless-security/eap-method-tls.c:279 +#: ../src/wireless-security/eap-method-tls.c:286 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3633,11 +3641,11 @@ "\n" "(Nastavit heslo svému soukromému klíči můžete prostřednictvím openssl.)" -#: ../src/wireless-security/eap-method-tls.c:455 +#: ../src/wireless-security/eap-method-tls.c:462 msgid "Choose your personal certificate..." msgstr "Vyberte vlastní certifikát…" -#: ../src/wireless-security/eap-method-tls.c:467 +#: ../src/wireless-security/eap-method-tls.c:474 msgid "Choose your private key..." msgstr "Vyberte soukromý klíč…" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/po/hu.po new/network-manager-applet-1.0.6/po/hu.po --- old/network-manager-applet-1.0.4/po/hu.po 2015-07-02 10:00:37.000000000 +0200 +++ new/network-manager-applet-1.0.6/po/hu.po 2015-08-27 17:54:15.000000000 +0200 @@ -11,8 +11,8 @@ "Project-Id-Version: network-manager-applet master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n" -"POT-Creation-Date: 2015-06-23 11:10+0000\n" -"PO-Revision-Date: 2015-06-23 15:02+0200\n" +"POT-Creation-Date: 2015-07-17 11:11+0000\n" +"PO-Revision-Date: 2015-07-17 16:33+0200\n" "Last-Translator: Balázs Úr <urbal...@gmail.com>\n" "Language-Team: Hungarian <openscope at googlegroups dot com>\n" "Language: hu\n" @@ -453,7 +453,7 @@ msgstr "A felhasználó hitelesítése szükséges a hálózati kapcsolathoz („%s”)…" #: ../src/applet.c:2807 ../src/applet-device-bt.c:137 -#: ../src/applet-device-wimax.c:446 ../src/mobile-helpers.c:602 +#: ../src/applet-device-wimax.c:446 ../src/mobile-helpers.c:601 #, c-format msgid "Requesting a network address for '%s'..." msgstr "Hálózati cím kérése a következőhöz: „%s”…" @@ -619,25 +619,25 @@ msgstr "Kapcsolódott a mobil széles sávú hálózathoz." #: ../src/applet-device-bt.c:128 ../src/applet-device-wimax.c:437 -#: ../src/mobile-helpers.c:593 +#: ../src/mobile-helpers.c:592 #, c-format msgid "Preparing mobile broadband connection '%s'..." msgstr "„%s” mobil széles sávú kapcsolat előkészítése…" #: ../src/applet-device-bt.c:131 ../src/applet-device-wimax.c:440 -#: ../src/mobile-helpers.c:596 +#: ../src/mobile-helpers.c:595 #, c-format msgid "Configuring mobile broadband connection '%s'..." msgstr "„%s” mobil széles sávú kapcsolat beállítása…" #: ../src/applet-device-bt.c:134 ../src/applet-device-wimax.c:443 -#: ../src/mobile-helpers.c:599 +#: ../src/mobile-helpers.c:598 #, c-format msgid "User authentication required for mobile broadband connection '%s'..." msgstr "" "Felhasználói hitelesítés szükséges a mobil széles sávú kapcsolathoz („%s”)…" -#: ../src/applet-device-bt.c:141 ../src/mobile-helpers.c:618 +#: ../src/applet-device-bt.c:141 ../src/mobile-helpers.c:617 #, c-format msgid "Mobile broadband connection '%s' active" msgstr "„%s” mobil széles sávú kapcsolat aktív" @@ -932,12 +932,12 @@ msgid "You are now connected to the WiMAX network." msgstr "Kapcsolódott a WiMAX hálózathoz." -#: ../src/applet-device-wimax.c:455 ../src/mobile-helpers.c:613 +#: ../src/applet-device-wimax.c:455 ../src/mobile-helpers.c:612 #, c-format msgid "Mobile broadband connection '%s' active: (%d%%%s%s)" msgstr "„%s” mobil széles sávú kapcsolat aktív: (%d%%%s%s)" -#: ../src/applet-device-wimax.c:458 ../src/mobile-helpers.c:616 +#: ../src/applet-device-wimax.c:458 ../src/mobile-helpers.c:615 msgid "roaming" msgstr "barangoló" @@ -1682,7 +1682,7 @@ #: ../src/connection-editor/ce-page-dsl.ui.h:3 #: ../src/wireless-security/eap-method-leap.ui.h:3 -#: ../src/wireless-security/eap-method-simple.ui.h:4 +#: ../src/wireless-security/eap-method-simple.ui.h:3 #: ../src/wireless-security/eap-method-tls.ui.h:7 #: ../src/wireless-security/ws-leap.ui.h:3 #: ../src/wireless-security/ws-wpa-psk.ui.h:3 @@ -1691,7 +1691,7 @@ #: ../src/connection-editor/ce-page-dsl.ui.h:4 #: ../src/connection-editor/ce-page-mobile.ui.h:4 -#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95 +#: ../src/libnm-gtk/nm-vpn-password-dialog.c:100 #: ../src/wireless-security/eap-method-leap.ui.h:2 #: ../src/wireless-security/eap-method-simple.ui.h:2 #: ../src/wireless-security/ws-leap.ui.h:2 @@ -1761,7 +1761,6 @@ #: ../src/connection-editor/ce-page-infiniband.ui.h:2 #: ../src/connection-editor/ce-page-wifi.ui.h:8 #: ../src/connection-editor/ce-page-wimax.ui.h:1 -#| msgid "_Service:" msgid "_Device:" msgstr "_Eszköz:" @@ -2554,9 +2553,6 @@ #: ../src/connection-editor/page-ethernet.c:79 #: ../src/connection-editor/page-wimax.c:59 -#| msgid "" -#| "This option locks this connection to the network device specified by its " -#| "permanent MAC address entered here. Example: 00:11:22:33:44:55" msgid "" "This option locks this connection to the network device specified either by " "its interface name or permanent MAC or both. Examples: \"em1\", " @@ -2608,8 +2604,9 @@ msgstr "" "Ez a lehetőség a hálózati eszközhöz való kapcsolódás lehetőségét az itt " "megadott csatoló nevére, állandó MAC-címre vagy mindkettőre korlátozza. " -"Példák: „ib0”, „80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65”, " -"„ib0 (80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”" +"Példák: „ib0”, „80:00:00:48:fe:80:00:00:00:00:00:00:00:02:" +"c9:03:00:00:0f:65”, „ib0 (80:00:00:48:fe:80:00:00:00:00:00:00:00:02:" +"c9:03:00:00:0f:65)”" #: ../src/connection-editor/page-infiniband.c:161 msgid "Could not load InfiniBand user interface." @@ -2735,11 +2732,11 @@ msgstr "Nem támogatott mobil széles sávú kapcsolattípus." #. Fall back to just asking for GSM vs. CDMA -#: ../src/connection-editor/page-mobile.c:556 +#: ../src/connection-editor/page-mobile.c:539 msgid "Select Mobile Broadband Provider Type" msgstr "Válassza ki a mobil széles sávú szolgáltatás típusát" -#: ../src/connection-editor/page-mobile.c:583 +#: ../src/connection-editor/page-mobile.c:566 msgid "" "Select the technology your mobile broadband provider uses. If you are " "unsure, ask your provider." @@ -2747,22 +2744,22 @@ "Válassza ki a mobil széles sávú szolgáltató által használt technológiát. Ha " "bizonytalan, kérdezze meg szolgáltatóját." -#: ../src/connection-editor/page-mobile.c:588 +#: ../src/connection-editor/page-mobile.c:571 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)" msgstr "" "A szolgáltatóm _GSM-alapú technológiát használ (azaz GPRS, EDGE, UMTS, HSDPA)" -#: ../src/connection-editor/page-mobile.c:595 +#: ../src/connection-editor/page-mobile.c:578 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)" msgstr "A szolgáltatóm C_DMA-alapú technológiát használ (azaz 1xRTT, EVDO)" -#: ../src/connection-editor/page-mobile.c:605 ../src/mb-menu-item.c:54 -#: ../src/mobile-helpers.c:280 +#: ../src/connection-editor/page-mobile.c:588 ../src/mb-menu-item.c:54 +#: ../src/mobile-helpers.c:279 msgid "CDMA" msgstr "CDMA" -#: ../src/connection-editor/page-mobile.c:608 ../src/mb-menu-item.c:58 -#: ../src/mobile-helpers.c:278 +#: ../src/connection-editor/page-mobile.c:591 ../src/mb-menu-item.c:58 +#: ../src/mobile-helpers.c:277 msgid "GSM" msgstr "GSM" @@ -2906,9 +2903,6 @@ "az itt megadott BSSID-re korlátozza. Például: 00:11:22:33:44:55" #: ../src/connection-editor/page-wifi.c:94 -#| msgid "" -#| "This option locks this connection to the network device specified by its " -#| "permanent MAC address entered here. Example: 00:11:22:33:44:55" msgid "" "This option locks this connection to the network device specified either by " "its interface name or permanent MAC or both. Examples: \"wlan0\", " @@ -3335,6 +3329,22 @@ msgid "%s %s" msgstr "%s %s" +#: ../src/libnm-gtk/nm-ui-utils.c:620 +msgid "Store the password only for this _user" +msgstr "A jelszó tárolása csak ehhez a _felhasználóhoz" + +#: ../src/libnm-gtk/nm-ui-utils.c:621 +msgid "Store the password for _all users" +msgstr "Jelszó tárolása _minden felhasználóhoz" + +#: ../src/libnm-gtk/nm-ui-utils.c:622 +msgid "As_k for this password every time" +msgstr "Jelszó bekérése min_den alkalommal" + +#: ../src/libnm-gtk/nm-ui-utils.c:623 +msgid "The password is _not required" +msgstr "A jelszó _nem szükséges" + #: ../src/libnm-gtk/nm-wifi-dialog.c:441 msgid "New..." msgstr "Új…" @@ -3392,11 +3402,16 @@ "Adja meg a rejtett Wi-Fi hálózat nevét és biztonsági adatait, amelyhez " "kapcsolódni kíván." -#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97 +#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102 msgid "_Secondary Password:" msgstr "_Másodlagos jelszó:" -#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236 +#: ../src/libnm-gtk/nm-vpn-password-dialog.c:105 +#| msgid "_Secondary Password:" +msgid "_Ternary Password:" +msgstr "_Harmadlagos jelszó:" + +#: ../src/libnm-gtk/nm-vpn-password-dialog.c:250 msgid "Sh_ow passwords" msgstr "_Jelszavak megjelenítése" @@ -3514,16 +3529,16 @@ msgid "Roaming network" msgstr "Barangoló hálózat" -#: ../src/mobile-helpers.c:328 +#: ../src/mobile-helpers.c:327 #, c-format msgid "PIN code for SIM card '%s' on '%s'" msgstr "A(z) „%s” SIM-kártya PIN-kódja ezen: „%s”" -#: ../src/mobile-helpers.c:461 +#: ../src/mobile-helpers.c:460 msgid "PIN code required" msgstr "PIN kód szükséges" -#: ../src/mobile-helpers.c:469 +#: ../src/mobile-helpers.c:468 msgid "PIN code is needed for the mobile broadband device" msgstr "PIN kód szükséges a mobil széles sávú eszközhöz" @@ -3533,14 +3548,6 @@ msgid "%s connection" msgstr "%s kapcsolat" -#: ../src/utils/utils.c:379 -msgid "Store the password only for this _user" -msgstr "A jelszó tárolása csak ehhez a _felhasználóhoz" - -#: ../src/utils/utils.c:381 -msgid "Store the password for _all users" -msgstr "Jelszó tárolása _minden felhasználóhoz" - #: ../src/wireless-security/eap-method.c:440 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" msgstr "DER, PEM vagy PKCS#12 személyes kulcsok (*.der, *.pem, *.p12, *.key)" @@ -3606,7 +3613,7 @@ msgstr "MD5" #: ../src/wireless-security/eap-method-peap.c:378 -#: ../src/wireless-security/eap-method-tls.c:461 +#: ../src/wireless-security/eap-method-tls.c:468 #: ../src/wireless-security/eap-method-ttls.c:409 msgid "Choose a Certificate Authority certificate..." msgstr "Válasszon hitelesítésszolgáltatói tanúsítványt…" @@ -3635,15 +3642,11 @@ msgid "PEAP _version:" msgstr "_PEAP verzió:" -#: ../src/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "Jelszó bekérése min_den alkalommal" - -#: ../src/wireless-security/eap-method-tls.c:276 +#: ../src/wireless-security/eap-method-tls.c:283 msgid "Unencrypted private keys are insecure" msgstr "A nem titkosított személyes kulcsok nem biztonságosak" -#: ../src/wireless-security/eap-method-tls.c:279 +#: ../src/wireless-security/eap-method-tls.c:286 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3657,11 +3660,11 @@ "\n" "Személyes kulcsát az OpenSSL segítségével teheti jelszóval védetté." -#: ../src/wireless-security/eap-method-tls.c:455 +#: ../src/wireless-security/eap-method-tls.c:462 msgid "Choose your personal certificate..." msgstr "Válassza ki a személyes tanúsítványát…" -#: ../src/wireless-security/eap-method-tls.c:467 +#: ../src/wireless-security/eap-method-tls.c:474 msgid "Choose your private key..." msgstr "Válassza ki a személyes kulcsát…" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/po/pl.po new/network-manager-applet-1.0.6/po/pl.po --- old/network-manager-applet-1.0.4/po/pl.po 2015-07-14 17:36:31.000000000 +0200 +++ new/network-manager-applet-1.0.6/po/pl.po 2015-08-27 17:54:15.000000000 +0200 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: network-manager-applet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-10 00:37+0200\n" -"PO-Revision-Date: 2015-07-10 00:38+0200\n" +"POT-Creation-Date: 2015-08-13 03:34+0200\n" +"PO-Revision-Date: 2015-08-13 03:35+0200\n" "Last-Translator: Piotr Drąg <piotrd...@gmail.com>\n" "Language-Team: Polish <gnom...@aviary.pl>\n" "Language: pl\n" @@ -134,6 +134,30 @@ "Ustawienie na \"true\" wyłącza ostrzeżenia o certyfikatach CA podczas " "drugiego etapu uwierzytelniania EAP." +#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1 +msgid "NetworkManager" +msgstr "NetworkManager" + +#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2 +msgid "NetworkManager for GNOME" +msgstr "NetworkManager dla środowiska GNOME" + +#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3 +msgid "" +"NetworkManager is a system service for managing and configuring your network " +"connections and devices." +msgstr "" +"NetworkManager jest usługą systemową do zarządzania i konfigurowania " +"połączeń i urządzeń sieciowych." + +#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4 +msgid "" +"The nm-connection-editor program works with NetworkManager to create and " +"edit existing connection profiles for NetworkManager." +msgstr "" +"Program nm-connection-editor umożliwia tworzenie i modyfikowanie " +"istniejących profilów połączeń za pomocą usługi NetworkManager." + #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105 msgid "802.1X authentication" msgstr "Uwierzytelnianie 802.1X" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/src/connection-editor/ce-page-bond.ui new/network-manager-applet-1.0.6/src/connection-editor/ce-page-bond.ui --- old/network-manager-applet-1.0.4/src/connection-editor/ce-page-bond.ui 2015-07-02 10:00:37.000000000 +0200 +++ new/network-manager-applet-1.0.6/src/connection-editor/ce-page-bond.ui 2015-08-27 17:54:15.000000000 +0200 @@ -101,7 +101,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Mode:</property> + <property name="label" translatable="yes">M_ode:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">bond_mode</property> </object> @@ -538,7 +538,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">9</property> + <property name="top_attach">10</property> <property name="width">1</property> <property name="height">1</property> </packing> @@ -577,7 +577,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">9</property> + <property name="top_attach">10</property> <property name="width">1</property> <property name="height">1</property> </packing> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/src/connection-editor/ce-page-team.ui new/network-manager-applet-1.0.6/src/connection-editor/ce-page-team.ui --- old/network-manager-applet-1.0.4/src/connection-editor/ce-page-team.ui 2015-07-02 10:00:37.000000000 +0200 +++ new/network-manager-applet-1.0.6/src/connection-editor/ce-page-team.ui 2015-08-27 17:54:15.000000000 +0200 @@ -9,6 +9,11 @@ <column type="gchararray"/> </columns> </object> + <object class="GtkAdjustment" id="team_mtu_adjustment"> + <property name="upper">10000</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> <object class="GtkGrid" id="TeamPage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -26,7 +31,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">2</property> <property name="width">2</property> <property name="height">1</property> </packing> @@ -42,7 +47,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="top_attach">4</property> <property name="width">2</property> <property name="height">1</property> </packing> @@ -63,14 +68,14 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="top_attach">5</property> <property name="width">2</property> <property name="height">1</property> </packing> </child> <child> <object class="GtkButton" id="import_config_button"> - <property name="label" translatable="yes">I_mport team configuration from a file...</property> + <property name="label" translatable="yes">Im_port team configuration from a file...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="use_underline">True</property> @@ -78,7 +83,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="top_attach">6</property> <property name="width">2</property> <property name="height">1</property> </packing> @@ -181,7 +186,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">3</property> <property name="width">2</property> </packing> </child> @@ -211,5 +216,60 @@ <property name="top_attach">0</property> </packing> </child> + <child> + <object class="GtkLabel" id="team_mtu_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_MTU:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">team_mtu</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="team_mtu_box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">4</property> + <child> + <object class="GtkSpinButton" id="team_mtu"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">team_mtu_adjustment</property> + <property name="climb_rate">1</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label29"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">bytes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> </object> </interface> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/src/connection-editor/main.c new/network-manager-applet-1.0.6/src/connection-editor/main.c --- old/network-manager-applet-1.0.4/src/connection-editor/main.c 2015-07-02 10:00:37.000000000 +0200 +++ new/network-manager-applet-1.0.6/src/connection-editor/main.c 2015-08-27 17:54:15.000000000 +0200 @@ -141,7 +141,7 @@ idle_create_connection (gpointer user_data) { NMConnectionList *list = user_data; - GType ctype = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (list), "nm-connection-editor-ctype")); + GType ctype = (GType) GPOINTER_TO_SIZE (g_object_get_data (G_OBJECT (list), "nm-connection-editor-ctype")); char *detail = g_object_get_data (G_OBJECT (list), "nm-connection-editor-detail"); nm_connection_list_create (list, ctype, detail); @@ -193,7 +193,7 @@ */ g_idle_add (idle_create_connection, list); g_object_set_data (G_OBJECT (list), "nm-connection-editor-ctype", - GUINT_TO_POINTER (ctype)); + GSIZE_TO_POINTER (ctype)); g_object_set_data_full (G_OBJECT (list), "nm-connection-editor-detail", g_strdup (detail), g_free); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/src/connection-editor/nm-connection-list.c new/network-manager-applet-1.0.6/src/connection-editor/nm-connection-list.c --- old/network-manager-applet-1.0.4/src/connection-editor/nm-connection-list.c 2015-07-02 10:00:37.000000000 +0200 +++ new/network-manager-applet-1.0.6/src/connection-editor/nm-connection-list.c 2015-08-27 17:54:15.000000000 +0200 @@ -851,6 +851,8 @@ GtkTreePath *path; GtkTreeIter iter; + list->connections_available = TRUE; + g_signal_handlers_disconnect_by_func (settings, G_CALLBACK (initial_connections_read), list); if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->sortable), &iter)) { @@ -932,6 +934,33 @@ self->displayed_type = ctype; } +typedef struct { + NMConnectionList *self; + const char *detail; + PageNewConnectionFunc new_connection_func; +} CreateConnectionData; + +static gboolean +create_connection (CreateConnectionData *data) +{ + static guint idle_func_id = 0; + + if (data->self->connections_available) { + new_connection_of_type (GTK_WINDOW (data->self->dialog), + data->detail, + data->self->settings, + data->new_connection_func, + really_add_connection, + data->self); + g_slice_free (CreateConnectionData, data); + return FALSE; + } else { + if (!idle_func_id) + idle_func_id = g_idle_add ((GSourceFunc) create_connection, data); + return TRUE; + } +} + void nm_connection_list_create (NMConnectionList *self, GType ctype, const char *detail) { @@ -957,12 +986,17 @@ nm_connection_editor_error (NULL, _("Error creating connection"), error_msg); g_free (error_msg); } else { - new_connection_of_type (GTK_WINDOW (self->dialog), - detail, - self->settings, - types[i].new_connection_func, - really_add_connection, - self); + CreateConnectionData *data; + + data = g_slice_new0 (CreateConnectionData); + data->self = self; + data->detail = detail; + data->new_connection_func = types[i].new_connection_func; + + /* We need a complete list of connections even when creating a new + * connection, because we may depend on another connection. Thus we + * have to wait for connections to be available. */ + create_connection (data); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/src/connection-editor/nm-connection-list.h new/network-manager-applet-1.0.6/src/connection-editor/nm-connection-list.h --- old/network-manager-applet-1.0.4/src/connection-editor/nm-connection-list.h 2015-07-02 10:00:37.000000000 +0200 +++ new/network-manager-applet-1.0.6/src/connection-editor/nm-connection-list.h 2015-08-27 17:54:15.000000000 +0200 @@ -50,6 +50,7 @@ GtkWidget *dialog; gboolean signals_connected; + gboolean connections_available; } NMConnectionList; typedef struct { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/src/connection-editor/page-bond.c new/network-manager-applet-1.0.6/src/connection-editor/page-bond.c --- old/network-manager-applet-1.0.4/src/connection-editor/page-bond.c 2015-07-02 10:00:37.000000000 +0200 +++ new/network-manager-applet-1.0.6/src/connection-editor/page-bond.c 2015-08-27 17:54:15.000000000 +0200 @@ -551,13 +551,12 @@ g_free (targets); mtu = gtk_spin_button_get_value_as_int (priv->mtu); - if (mtu) { - if (!priv->wired) { - priv->wired = NM_SETTING_WIRED (nm_setting_wired_new ()); - nm_connection_add_setting (connection, NM_SETTING (priv->wired)); - } - g_object_set (priv->wired, NM_SETTING_WIRED_MTU, mtu, NULL); + if (mtu && !priv->wired) { + priv->wired = NM_SETTING_WIRED (nm_setting_wired_new ()); + nm_connection_add_setting (connection, NM_SETTING (priv->wired)); } + if (priv->wired) + g_object_set (priv->wired, NM_SETTING_WIRED_MTU, mtu, NULL); } static gboolean diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/src/connection-editor/page-team.c new/network-manager-applet-1.0.6/src/connection-editor/page-team.c --- old/network-manager-applet-1.0.4/src/connection-editor/page-team.c 2015-07-02 10:00:37.000000000 +0200 +++ new/network-manager-applet-1.0.6/src/connection-editor/page-team.c 2015-08-27 17:54:15.000000000 +0200 @@ -38,6 +38,7 @@ typedef struct { NMSettingTeam *setting; + NMSettingWired *wired; int slave_arptype; @@ -45,6 +46,7 @@ GtkTextView *json_config_widget; GtkWidget *import_config_button; + GtkSpinButton *mtu; } CEPageTeamPrivate; static void @@ -68,12 +70,19 @@ priv->json_config_widget = GTK_TEXT_VIEW (gtk_builder_get_object (builder, "team_json_config")); priv->import_config_button = GTK_WIDGET (gtk_builder_get_object (builder, "import_config_button")); + priv->mtu = GTK_SPIN_BUTTON (gtk_builder_get_object (builder, "team_mtu")); /* Wait for widget to be realized to get toplevel window */ g_signal_connect (priv->json_config_widget, "realize", G_CALLBACK (widget_realized_cb), self); } static void +stuff_changed (GtkWidget *w, gpointer user_data) +{ + ce_page_changed (CE_PAGE (user_data)); +} + +static void json_config_changed (GObject *object, CEPageTeam *self) { ce_page_changed (CE_PAGE (self)); @@ -130,6 +139,7 @@ NMSettingTeam *s_team = priv->setting; GtkTextBuffer *buffer; const char *json_config; + guint32 mtu_def, mtu_val; buffer = gtk_text_view_get_buffer (priv->json_config_widget); json_config = nm_setting_team_get_config (s_team); @@ -137,6 +147,18 @@ g_signal_connect (buffer, "changed", G_CALLBACK (json_config_changed), self); g_signal_connect (priv->import_config_button, "clicked", G_CALLBACK (import_button_clicked_cb), self); + + /* MTU */ + if (priv->wired) { + mtu_def = ce_get_property_default (NM_SETTING (priv->wired), NM_SETTING_WIRED_MTU); + mtu_val = nm_setting_wired_get_mtu (priv->wired); + } else { + mtu_def = mtu_val = 0; + } + g_signal_connect (priv->mtu, "output", + G_CALLBACK (ce_spin_output_with_automatic), + GINT_TO_POINTER (mtu_def)); + gtk_spin_button_set_value (priv->mtu, (gdouble) mtu_val); } static void @@ -217,10 +239,14 @@ static void finish_setup (CEPageTeam *self, gpointer unused, GError *error, gpointer user_data) { + CEPageTeamPrivate *priv = CE_PAGE_TEAM_GET_PRIVATE (self); + if (error) return; populate_ui (self); + + g_signal_connect (priv->mtu, "value-changed", G_CALLBACK (stuff_changed), self); } CEPage * @@ -256,6 +282,7 @@ priv->setting = NM_SETTING_TEAM (nm_setting_team_new ()); nm_connection_add_setting (connection, NM_SETTING (priv->setting)); } + priv->wired = nm_connection_get_setting_wired (connection); g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL); @@ -266,9 +293,11 @@ ui_to_setting (CEPageTeam *self) { CEPageTeamPrivate *priv = CE_PAGE_TEAM_GET_PRIVATE (self); + NMConnection *connection = CE_PAGE (self)->connection; GtkTextBuffer *buffer; GtkTextIter start, end; char *json_config; + guint32 mtu; buffer = gtk_text_view_get_buffer (priv->json_config_widget); gtk_text_buffer_get_iter_at_offset (buffer, &start, 0); @@ -281,6 +310,15 @@ NM_SETTING_TEAM_CONFIG, json_config, NULL); g_free (json_config); + + mtu = gtk_spin_button_get_value_as_int (priv->mtu); + if (mtu && !priv->wired) { + priv->wired = NM_SETTING_WIRED (nm_setting_wired_new ()); + nm_connection_add_setting (connection, NM_SETTING (priv->wired)); + } + if (priv->wired) + g_object_set (priv->wired, NM_SETTING_WIRED_MTU, mtu, NULL); + } static gboolean diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/src/libnm-gtk/Makefile.am new/network-manager-applet-1.0.6/src/libnm-gtk/Makefile.am --- old/network-manager-applet-1.0.4/src/libnm-gtk/Makefile.am 2015-07-02 10:00:37.000000000 +0200 +++ new/network-manager-applet-1.0.6/src/libnm-gtk/Makefile.am 2015-08-27 09:00:14.000000000 +0200 @@ -50,9 +50,10 @@ $(top_builddir)/src/marshallers/libmarshallers.la \ $(top_builddir)/src/wireless-security/libwireless-security.la -libnm_gtk_la_LDFLAGS = -Wl,-no-undefined \ - -export-symbols-regex '^nma_.*' +EXTRA_libnm_gtk_la_DEPENDENCIES = $(srcdir)/libnm-gtk.ver +libnm_gtk_la_LDFLAGS = -Wl,-no-undefined \ + -Wl,--version-script=$(srcdir)/libnm-gtk.ver pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libnm-gtk.pc @@ -81,7 +82,10 @@ typelibdir = $(libdir)/girepository-1.0 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) +check-local: + $(top_srcdir)/src/libnm-gtk/check-exports.sh $(builddir)/.libs/libnm-gtk.so $(srcdir)/libnm-gtk.ver + CLEANFILES = $(gir_DATA) $(typelib_DATA) endif -EXTRA_DIST = libnm-gtk.pc.in $(ui_DATA) +EXTRA_DIST = libnm-gtk.pc.in libnm-gtk.ver check-exports.sh $(ui_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/src/libnm-gtk/check-exports.sh new/network-manager-applet-1.0.6/src/libnm-gtk/check-exports.sh --- old/network-manager-applet-1.0.4/src/libnm-gtk/check-exports.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/network-manager-applet-1.0.6/src/libnm-gtk/check-exports.sh 2015-07-15 17:53:31.000000000 +0200 @@ -0,0 +1,130 @@ +#!/bin/sh + +LC_ALL=C +export LC_ALL + +stat=0 +so="$1" +def="$2" +PATTERN="_ANCHOR_" + +TMPFILE="$(mktemp .nm-check-exports.XXXXXX)" + + +get_syms() { + nm "$1" | + sed -n 's/^[[:xdigit:]]\+ [DT] //p' | + sort +} + +get_1_0_0_syms() { + cat <<SYMBOLS +nma_country_info_get_country_code +nma_country_info_get_country_name +nma_country_info_get_providers +nma_country_info_get_type +nma_country_info_ref +nma_country_info_unref +nma_mobile_access_method_get_3gpp_apn +nma_mobile_access_method_get_dns +nma_mobile_access_method_get_family +nma_mobile_access_method_get_gateway +nma_mobile_access_method_get_name +nma_mobile_access_method_get_password +nma_mobile_access_method_get_type +nma_mobile_access_method_get_username +nma_mobile_access_method_ref +nma_mobile_access_method_unref +nma_mobile_provider_get_3gpp_mcc_mnc +nma_mobile_provider_get_cdma_sid +nma_mobile_provider_get_methods +nma_mobile_provider_get_name +nma_mobile_provider_get_type +nma_mobile_provider_ref +nma_mobile_providers_database_dump +nma_mobile_providers_database_get_countries +nma_mobile_providers_database_get_type +nma_mobile_providers_database_lookup_3gpp_mcc_mnc +nma_mobile_providers_database_lookup_cdma_sid +nma_mobile_providers_database_lookup_country +nma_mobile_providers_database_new +nma_mobile_providers_database_new_finish +nma_mobile_providers_database_new_sync +nma_mobile_providers_split_3gpp_mcc_mnc +nma_mobile_provider_unref +nma_mobile_wizard_destroy +nma_mobile_wizard_new +nma_mobile_wizard_present +nma_utils_disambiguate_device_names +nma_utils_get_connection_device_name +nma_utils_get_device_description +nma_utils_get_device_generic_type_name +nma_utils_get_device_product +nma_utils_get_device_type_name +nma_utils_get_device_vendor +nma_vpn_password_dialog_focus_password +nma_vpn_password_dialog_focus_password_secondary +nma_vpn_password_dialog_get_password +nma_vpn_password_dialog_get_password_secondary +nma_vpn_password_dialog_get_type +nma_vpn_password_dialog_new +nma_vpn_password_dialog_run_and_block +nma_vpn_password_dialog_set_password +nma_vpn_password_dialog_set_password_label +nma_vpn_password_dialog_set_password_secondary +nma_vpn_password_dialog_set_password_secondary_label +nma_vpn_password_dialog_set_show_password +nma_vpn_password_dialog_set_show_password_secondary +nma_wifi_dialog_get_connection +nma_wifi_dialog_get_nag_ignored +nma_wifi_dialog_get_type +nma_wifi_dialog_nag_user +nma_wifi_dialog_new +nma_wifi_dialog_new_for_create +nma_wifi_dialog_new_for_hidden +nma_wifi_dialog_new_for_other +nma_wifi_dialog_set_nag_ignored +nma_wireless_dialog_get_connection +nma_wireless_dialog_get_type +nma_wireless_dialog_new +nma_wireless_dialog_new_for_create +nma_wireless_dialog_new_for_other +SYMBOLS + } + +get_syms_from_def() { + (sed -n 's/^\t\(\([_a-zA-Z0-9]\+\)\|#\s*\([_a-zA-Z0-9]\+@@\?[_a-zA-Z0-9]\+\)\);$/\2\3/p' "$1"; + get_1_0_0_syms) | + sort +} + +anchor() { + sed "s/.*/$PATTERN\0$PATTERN/" +} + +unanchor() { + sed "s/^$PATTERN\(.*\)$PATTERN\$/\1/" +} + + +get_syms "$so" | anchor > "$TMPFILE" +WRONG="$(get_syms_from_def "$def" | anchor | grep -F -f - "$TMPFILE" -v)" +RESULT=$? +if [ $RESULT -eq 0 ]; then + stat=1 + echo ">>library \"$so\" exports symbols that are not in linker script \"$def\":" + echo "$WRONG" | unanchor | nl +fi + +get_syms_from_def "$def" | anchor > "$TMPFILE" +WRONG="$(get_syms "$so" | anchor | grep -F -f - "$TMPFILE" -v)" +RESULT=$? +if [ $RESULT -eq 0 ]; then + stat=1 + echo ">>linker script \"$def\" contains symbols that are not exported by library \"$so\":" + echo "$WRONG" | unanchor | nl +fi + +rm -rf "$TMPFILE" +exit $stat + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-manager-applet-1.0.4/src/libnm-gtk/libnm-gtk.ver new/network-manager-applet-1.0.6/src/libnm-gtk/libnm-gtk.ver --- old/network-manager-applet-1.0.4/src/libnm-gtk/libnm-gtk.ver 1970-01-01 01:00:00.000000000 +0100 +++ new/network-manager-applet-1.0.6/src/libnm-gtk/libnm-gtk.ver 2015-08-27 17:54:15.000000000 +0200 @@ -0,0 +1,16 @@ +libnm_gtk_1_0_6 { +global: + nma_utils_menu_to_secret_flags; + nma_utils_setup_password_storage; + nma_utils_update_password_storage; + nma_vpn_password_dialog_focus_password_ternary; + nma_vpn_password_dialog_get_password_ternary; + nma_vpn_password_dialog_set_password_ternary; + nma_vpn_password_dialog_set_password_ternary_label; + nma_vpn_password_dialog_set_show_password_ternary; +local: + [^n]*; + n[^m]*; + nm[^a]*; + nma[^_]*; +}; ++++++ nm-applet-app-indicator.patch ++++++ ++++ 1323 lines (skipped) ++++++ pre_checkin.sh ++++++ #!/bin/sh cp NetworkManager-gnome.changes NetworkManager-appindicator.changes sed "s/\(%define *build_appindicator *\)0/\11/;s/\(^Name: *\)NetworkManager-gnome.*/\1NetworkManager-appindicator/" NetworkManager-gnome.spec > NetworkManager-appindicator.spec sed -i " /^Name: *NetworkManager-appindicator/i \ # Do not edit this auto generated file! Edit NetworkManager-gnome.spec. " NetworkManager-appindicator.spec