diff --git a/.cvsignore b/.cvsignore index 1bf5dbb..77aff0c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -132,3 +132,5 @@ network-manager-applet-0.7.0.svn1091.tar.gz NetworkManager-0.7.0.git20090207.tar.bz2 network-manager-applet-0.7.0.svn1146.tar.gz network-manager-applet-0.7.0.svn1148.tar.gz +NetworkManager-0.7.0.97.tar.gz +network-manager-applet-0.7.0.97.tar.gz diff --git a/NetworkManager.spec b/NetworkManager.spec index 5ec7a78..b599207 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -9,20 +9,20 @@ ExcludeArch: s390 s390x %define libnl_version 1.1 %define ppp_version 2.2.4 -%define snapshot git20090207 -%define applet_snapshot svn1148 +%define snapshot %{nil} +%define applet_snapshot %{nil} Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 -Version: 0.7.0 -Release: 2.%{snapshot}%{?dist} +Version: 0.7.0.97 +Release: 1%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ -Source: %{name}-%{version}.%{snapshot}.tar.bz2 -Source1: network-manager-applet-%{version}.%{applet_snapshot}.tar.gz +Source: %{name}-%{version}%{snapshot}.tar.gz +Source1: network-manager-applet-%{version}%{applet_snapshot}.tar.gz Source2: nm-system-settings.conf Patch1: nm-applet-internal-buildfixes.patch Patch2: explain-dns1-dns2.patch @@ -40,6 +40,7 @@ Requires: %{name}-glib = %{epoch}:%{version}-%{release} Requires: ppp >= %{ppp_version} Requires: avahi-autoipd Requires: dnsmasq +Requires: udev-extras Obsoletes: dhcdbd Conflicts: NetworkManager-vpnc < 1:0.7.0-1 @@ -67,6 +68,7 @@ BuildRequires: nss-devel >= 3.11.7 BuildRequires: PolicyKit-devel PolicyKit-gnome-devel BuildRequires: dhclient BuildRequires: gtk-doc +BuildRequires: libudev-devel %description NetworkManager attempts to keep an active network connection available at all @@ -159,7 +161,7 @@ autoreconf -i make # build the applet -pushd network-manager-applet-0.7.0 +pushd network-manager-applet-%{version} autoreconf -i intltoolize --force %configure --disable-static --enable-more-warnings=yes @@ -175,7 +177,7 @@ make install DESTDIR=$RPM_BUILD_ROOT %{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ # install the applet -pushd network-manager-applet-0.7.0 +pushd network-manager-applet-%{version} make install DESTDIR=$RPM_BUILD_ROOT popd @@ -247,7 +249,7 @@ fi %{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf %{_sysconfdir}/dbus-1/system.d/nm-dispatcher.conf %{_sysconfdir}/dbus-1/system.d/nm-system-settings.conf -%config %{_sysconfdir}/rc.d/init.d/NetworkManager +%config(noreplace) %{_sysconfdir}/rc.d/init.d/NetworkManager %{_sbindir}/%{name} %{_sbindir}/nm-system-settings %dir %{_sysconfdir}/%{name}/ @@ -289,7 +291,9 @@ fi %{_datadir}/nm-applet/ %{_datadir}/icons/hicolor/16x16/apps/*.png %{_datadir}/icons/hicolor/22x22/apps/*.png +%{_datadir}/icons/hicolor/32x32/apps/*.png %{_datadir}/icons/hicolor/48x48/apps/*.png +%{_datadir}/icons/hicolor/scalable/apps/*.svg %{_sysconfdir}/xdg/autostart/nm-applet.desktop %dir %{_datadir}/gnome-vpn-properties @@ -316,6 +320,19 @@ fi %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Wed Feb 18 2009 Dan Williams - 1:0.7.0.97-1 +- Update to 0.7.1rc1 +- nm: support for Huawei E160G mobile broadband devices (rh #466177) +- nm: fix misleading routing error message (rh #477916) +- nm: fix issues with 32-character SSIDs (rh #485312) +- nm: allow root to activate user connections +- nm: automatic modem detection with udev-extras +- nm: massive manpage rewrite +- applet: fix crash when showing the CA certificate ignore dialog a second time +- applet: clear keyring items when deleting a connection +- applet: fix max signal strength calculation in menu (rh #475123) +- applet: fix VPN export (rh #480496) + * Sat Feb 7 2009 Dan Williams - 1:0.7.0-2.git20090207 - applet: fix blank VPN connection message bubbles - applet: better handling of VPN routing on update diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch index 1c8c92f..84fa516 100644 --- a/nm-applet-internal-buildfixes.patch +++ b/nm-applet-internal-buildfixes.patch @@ -1,6 +1,6 @@ -diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac ---- NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac.buildfix 2008-11-17 08:37:21.000000000 -0500 -+++ NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/configure.ac.buildfix NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/configure.ac +--- NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/configure.ac.buildfix 2008-11-17 08:37:21.000000000 -0500 ++++ NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/configure.ac 2008-11-17 18:04:35.000000000 -0500 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.72 @@ -12,9 +12,9 @@ diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac.buildfix gtk+-2.0 >= 2.10 libglade-2.0 gmodule-export-2.0 -diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am ---- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 -+++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/connection-editor/Makefile.am +--- NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/connection-editor/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 ++++ NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/connection-editor/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -2,6 +2,10 @@ NULL= bin_PROGRAMS = nm-connection-editor @@ -38,9 +38,9 @@ diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor if NO_POLKIT_GNOME nm_connection_editor_LDADD += \ -diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am ---- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400 -+++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/gconf-helpers/Makefile.am +--- NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400 ++++ NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/gconf-helpers/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -58,9 +58,9 @@ diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Mak + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la -diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am ---- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 -+++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/Makefile.am.buildfix NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/Makefile.am +--- NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 ++++ NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -4,6 +4,10 @@ NULL= bin_PROGRAMS = nm-applet @@ -83,9 +83,9 @@ diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am.build gladedir = $(datadir)/nm-applet glade_DATA = applet.glade keyring.png -diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am ---- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400 -+++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/utils/Makefile.am +--- NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400 ++++ NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/utils/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -103,9 +103,9 @@ diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la + -diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am ---- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400 -+++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/wireless-security/Makefile.am +--- NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400 ++++ NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/wireless-security/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libwireless-security.la diff --git a/sources b/sources index ea07131..ac17047 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -6867d9428c940e10a8439c33a24462c5 NetworkManager-0.7.0.git20090207.tar.bz2 -98648f3ba457551d313485e5d67e3183 network-manager-applet-0.7.0.svn1148.tar.gz +b337385e4dbd60b7507fd8623e360a94 NetworkManager-0.7.0.97.tar.gz +627845b2f9a1087f1852fe807654d50d network-manager-applet-0.7.0.97.tar.gz