From 9e18a7192c1aeb0d20ea033fe297405c3aa44a55 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mar 24 2010 09:18:30 +0000 Subject: - core: don't exit early on non-fatal state file errors - core: fix Bluetooth connection issues (rh #572340) - applet: fix some translations (rh #576056) - applet: better feedback when wrong PIN/PUK is entered - applet: many updated translations - applet: PIN2 unlock not required for normal modem functionality - applet: fix wireless secrets dialog display --- diff --git a/NetworkManager.spec b/NetworkManager.spec index 22de773..c4ac90e 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -9,16 +9,15 @@ %define libnl_version 1.1 %define ppp_version 2.4.5 -%define snapshot .git20100219 -%define applet_snapshot .git20100219 -%define nmcli_snapshot -git20100219 +%define snapshot .git20100323 +%define applet_snapshot .git20100323 %define realversion 0.8 Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 Version: 0.8.0 -Release: 1%{snapshot}%{?dist} +Release: 3%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -26,11 +25,9 @@ URL: http://www.gnome.org/projects/NetworkManager/ Source: %{name}-%{realversion}%{snapshot}.tar.bz2 Source1: network-manager-applet-%{realversion}%{applet_snapshot}.tar.bz2 Source2: nm-system-settings.conf -Source3: nmcli%{nmcli_snapshot}.tar.bz2 Patch1: nm-applet-internal-buildfixes.patch Patch2: explain-dns1-dns2.patch Patch3: nm-applet-no-notifications.patch -Patch4: nmcli-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): chkconfig @@ -48,7 +45,7 @@ Requires: avahi-autoipd Requires: dnsmasq Requires: udev Requires: mobile-broadband-provider-info >= 0.20090602 -Requires: ModemManager >= 0.2-3.20090826 +Requires: ModemManager >= 0.3-3.git20100317 Obsoletes: dhcdbd Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1 @@ -157,12 +154,10 @@ NetworkManager functionality from applications that use glib. # unpack the applet and nmcli tar -xjf %{SOURCE1} -tar -xjf %{SOURCE3} %patch1 -p1 -b .buildfix %patch2 -p1 -b .explain-dns1-dns2 %patch3 -p1 -b .no-notifications -%patch4 -p1 -b .nmcli-buildfix %build @@ -186,12 +181,6 @@ autoreconf -i make %{?_smp_mflags} # build the applet -pushd nmcli - cmake . - make %{?_smp_mflags} -popd - -# build the applet pushd network-manager-applet-%{realversion} autoreconf -i intltoolize --force @@ -222,8 +211,6 @@ popd %{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/NetworkManager -%{__cp} nmcli/src/nmcli $RPM_BUILD_ROOT%{_bindir}/ - %find_lang %{name} %find_lang nm-applet cat nm-applet.lang >> %{name}.lang @@ -328,6 +315,7 @@ fi %dir %{_libdir}/NetworkManager %{_libdir}/NetworkManager/*.so* %{_mandir}/man1/* +%{_mandir}/man5/* %{_mandir}/man8/* %dir %{_localstatedir}/run/NetworkManager %dir %{_localstatedir}/lib/NetworkManager @@ -390,6 +378,28 @@ fi %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Tue Mar 23 2010 Dan Williams - 0.8-3.git20100323 +- core: don't exit early on non-fatal state file errors +- core: fix Bluetooth connection issues (rh #572340) +- applet: fix some translations (rh #576056) +- applet: better feedback when wrong PIN/PUK is entered +- applet: many updated translations +- applet: PIN2 unlock not required for normal modem functionality +- applet: fix wireless secrets dialog display + +* Wed Mar 17 2010 Dan Williams - 0.8-2.git20100317 +- man: many manpage updates +- core: determine classful prefix if non is given via DHCP +- core: ensure /etc/hosts is always up-to-date and correct (rh #569914) +- core: support GSM network and roaming preferences +- applet: startup speed enhancements +- applet: better support for OTP/token-based WiFi connections (rh #526383) +- applet: show GSM and CDMA registration status and signal strength when available +- applet: fix zombie GSM and CDMA devices in the menu +- applet: remove 4-character GSM PIN/PUK code limit +- applet: fix insensitive WiFi Create... button (rh #541163) +- applet: allow unlocking of mobile devices immediately when plugged in + * Fri Feb 19 2010 Dan Williams - 0.8-1.git20100219 - core: update to final 0.8 release - core: fix Bluetooth DUN connections when secrets are needed diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch index 0c5cf62..25e391b 100644 --- a/nm-applet-internal-buildfixes.patch +++ b/nm-applet-internal-buildfixes.patch @@ -91,7 +91,7 @@ diff -up NetworkManager-0.8/network-manager-applet-0.8/src/gnome-bluetooth/Makef + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la endif - EXTRA_DIST = \ + EXTRA_DIST = network-manager-applet.c diff -up NetworkManager-0.8/network-manager-applet-0.8/src/Makefile.am.buildfix NetworkManager-0.8/network-manager-applet-0.8/src/Makefile.am --- NetworkManager-0.8/network-manager-applet-0.8/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400 +++ NetworkManager-0.8/network-manager-applet-0.8/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400 diff --git a/nmcli-build.patch b/nmcli-build.patch deleted file mode 100644 index 1f8d57a..0000000 --- a/nmcli-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up NetworkManager-0.7.999/nmcli/src/CMakeLists.txt.foo NetworkManager-0.7.999/nmcli/src/CMakeLists.txt ---- NetworkManager-0.7.999/nmcli/src/CMakeLists.txt.foo 2010-01-20 18:49:43.561505337 -0800 -+++ NetworkManager-0.7.999/nmcli/src/CMakeLists.txt 2010-01-20 18:51:51.262342074 -0800 -@@ -1,14 +1,15 @@ - FIND_PACKAGE (PkgConfig REQUIRED) - PKG_CHECK_MODULES (GLIB2 REQUIRED glib-2.0>=2.18 ) - PKG_CHECK_MODULES (DBUS_GLIB REQUIRED dbus-glib-1>=0.76) --PKG_CHECK_MODULES (NETWORK_MANAGER REQUIRED NetworkManager>=0.7.998) --PKG_CHECK_MODULES (LIBNM REQUIRED libnm-glib>=0.7.998) --PKG_CHECK_MODULES (LIBNM REQUIRED libnm-utils>=0.7.998) -+#PKG_CHECK_MODULES (NETWORK_MANAGER REQUIRED NetworkManager>=0.7.998) -+#PKG_CHECK_MODULES (LIBNM REQUIRED libnm-glib>=0.7.998) -+#PKG_CHECK_MODULES (LIBNM REQUIRED libnm-utils>=0.7.998) - - INCLUDE_DIRECTORIES (${GLIB2_INCLUDE_DIRS}) - INCLUDE_DIRECTORIES (${DBUS_GLIB_INCLUDE_DIRS}) --INCLUDE_DIRECTORIES (${NETWORK_MANAGER_INCLUDE_DIRS}) --INCLUDE_DIRECTORIES (${LIBNM_INCLUDE_DIRS}) -+INCLUDE_DIRECTORIES (../../include) -+INCLUDE_DIRECTORIES (../../libnm-glib) -+INCLUDE_DIRECTORIES (../../libnm-util) - - #ADD_DEFINITIONS( -Wall -Werror -std=gnu89 -g -O2 -Wshadow - ADD_DEFINITIONS( -Wall -std=gnu89 -g -O0 -Wshadow -@@ -44,7 +45,7 @@ - INCLUDE_DIRECTORIES (${CMAKE_CURRENT_SOURCE_DIR}) - - ADD_EXECUTABLE (nmcli ${NMCLI_SRC}) --TARGET_LINK_LIBRARIES (nmcli ${LIBNM_LIBRARIES}) -+TARGET_LINK_LIBRARIES (nmcli -L../../libnm-util/.libs/ -L../../libnm-glib/.libs/ -lnm-glib -lnm-util -lnm-glib-vpn ${DBUS_GLIB_LIBRARIES}) - - INSTALL(TARGETS nmcli DESTINATION bin) - diff --git a/sources b/sources index 9d51b52..c29e167 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -c904a8a63e0417898cf3a311ec1ed2f6 NetworkManager-0.8.git20100219.tar.bz2 -af60e13c6481ee0dcfc991e56247bb6c network-manager-applet-0.8.git20100219.tar.bz2 -645f7ed29e1bcb52d59c2db12110cc3c nmcli-git20100219.tar.bz2 +64a9a7c259578eb45ffad3eddd895292 NetworkManager-0.8.git20100323.tar.bz2 +8c6615d2eacc1cd51b81995352de5639 network-manager-applet-0.8.git20100323.tar.bz2