diff --git a/.cvsignore b/.cvsignore index 6bf7aba..8d7c6c7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -104,3 +104,5 @@ NetworkManager-0.7.0.svn3590.tar.gz nm-applet-0.7.0.svn694.tar.gz NetworkManager-0.7.0.svn3675.tar.gz nm-applet-0.7.0.svn727.tar.gz +NetworkManager-0.7.0.svn3801.tar.gz +nm-applet-0.7.0.svn774.tar.gz diff --git a/NetworkManager-0.6.5-fixup-internal-applet-build.patch b/NetworkManager-0.6.5-fixup-internal-applet-build.patch index d2dc219..1575045 100644 --- a/NetworkManager-0.6.5-fixup-internal-applet-build.patch +++ b/NetworkManager-0.6.5-fixup-internal-applet-build.patch @@ -1,41 +1,17 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac --- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2007-11-13 09:53:39.000000000 -0500 +++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2007-11-13 15:14:13.000000000 -0500 -@@ -60,9 +60,6 @@ AC_C_BIGENDIAN +@@ -60,10 +60,6 @@ AC_C_BIGENDIAN PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.72 glib-2.0 >= 2.10 - NetworkManager >= 0.7.0 -- libnm_glib -- libnm-util +- libnm_glib >= 0.7.0 +- libnm-util >= 0.7.0 +- libnm_glib_vpn >= 0.7.0 gtk+-2.0 >= 2.10 libglade-2.0 gconf-2.0 -diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix 2007-09-22 22:54:27.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am 2007-11-13 15:14:13.000000000 -0500 -@@ -1,6 +1,10 @@ - - bin_PROGRAMS = nm-vpn-properties - -+INCLUDES = -I${top_srcdir}/../include \ -+ -I${top_srcdir}/../libnm-util \ -+ -I${top_srcdir}/../libnm-glib -+ - nm_vpn_propertiesdir=$(includedir)/NetworkManager - - nm_vpn_properties_HEADERS = \ -@@ -28,7 +32,9 @@ nm_vpn_properties_CFLAGS = \ - - nm_vpn_properties_LDADD = \ - $(NMA_LIBS) \ -- ${top_builddir}/src/gconf-helpers/libgconf-helpers.la -+ ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ -+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la - - CLEANFILES = $(server_DATA) *.bak *.gladep *~ - diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am --- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix 2007-10-27 18:23:56.000000000 -0400 +++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2007-11-13 15:14:13.000000000 -0500 @@ -102,7 +78,7 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am. diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am --- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2007-09-20 07:40:37.000000000 -0400 +++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2007-11-13 15:14:13.000000000 -0500 -@@ -2,6 +2,10 @@ NULL= +@@ -2,6 +2,10 @@ bin_PROGRAMS = nm-connection-editor @@ -113,18 +89,18 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am. nm_connection_editor_CPPFLAGS = \ $(NMA_CFLAGS) \ -DICONDIR=\""$(datadir)/icons"\" \ -@@ -29,8 +33,10 @@ nm_connection_editor_LDADD = \ - $(top_builddir)/src/gconf-helpers/libgconf-helpers.la \ +@@ -59,7 +63,10 @@ ${top_builddir}/src/wireless-security/libwireless-security.la \ ${top_builddir}/src/utils/libutils.la \ - $(NMA_LIBS) \ + $(NMA_LIBS) \ - $(POLKIT_LIBS) + $(POLKIT_LIBS) \ + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la \ ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib_vpn.la gladedir = $(datadir)/nm-applet - glade_DATA = nm-connection-editor.gladediff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am + glade_DATA = \ --- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix 2007-10-27 18:11:31.000000000 -0400 +++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2007-11-13 15:14:13.000000000 -0500 @@ -4,6 +4,10 @@ NULL= diff --git a/NetworkManager.spec b/NetworkManager.spec index b4c6449..71fb60c 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -9,8 +9,8 @@ ExcludeArch: s390 s390x %define libnl_version 1.0-0.15.pre8.git20071218 %define ppp_version 2.2.4 -%define snapshot svn3747 -%define applet_snapshot svn755 +%define snapshot svn3801 +%define applet_snapshot svn774 Name: NetworkManager Summary: Network connection manager and user applications @@ -171,7 +171,7 @@ popd # install NM make install DESTDIR=$RPM_BUILD_ROOT -%{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ +%{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ # install the applet pushd nm-applet-0.7.0 @@ -236,10 +236,10 @@ fi %config %{_sysconfdir}/rc.d/init.d/NetworkManager %{_sbindir}/%{name} %{_sbindir}/nm-system-settings -%{_sysconfdir}/nm-system-settings.conf -%dir %{_sysconfdir}/NetworkManager/ -%dir %{_sysconfdir}/NetworkManager/dispatcher.d -%dir %{_sysconfdir}/NetworkManager/VPN +%dir %{_sysconfdir}/%{name}/ +%dir %{_sysconfdir}/%{name}/dispatcher.d +%dir %{_sysconfdir}/%{name}/VPN +%{_sysconfdir}/%{name}/nm-system-settings.conf %{_bindir}/nm-tool %{_bindir}/nm-online %{_libexecdir}/nm-dhcp-client.action @@ -268,9 +268,7 @@ fi %defattr(-,root,root,0755) %{_sysconfdir}/dbus-1/system.d/nm-applet.conf %{_bindir}/nm-applet -%{_bindir}/nm-vpn-properties %{_bindir}/nm-connection-editor -%{_datadir}/gnome-vpn-properties/nm-vpn-properties.glade %{_datadir}/nm-applet/ %{_datadir}/icons/hicolor/16x16/apps/*.png %{_datadir}/icons/hicolor/22x22/apps/*.png @@ -287,12 +285,20 @@ fi %{_includedir}/libnm-glib/*.h %{_includedir}/NetworkManager/nm-*.h %{_libdir}/pkgconfig/libnm_glib.pc +%{_libdir}/pkgconfig/libnm_glib_vpn.pc %{_libdir}/pkgconfig/libnm-util.pc %{_libdir}/libnm_glib.so %{_libdir}/libnm_glib_vpn.so %{_libdir}/libnm-util.so %changelog +* Wed Jul 02 2008 Dan Williams - 1:0.7.0-0.10.svn3801 +- Move VPN configuration into connection editor +- Fix mobile broadband username/password issues +- Fix issues with broken rfkill setups (rh #448889) +- Honor APN setting for GSM mobile broadband configurations +- Fix adding CDMA connections in the connection editor + * Wed Jun 11 2008 Dan Williams - 1:0.7.0-0.10.svn3747 - Update to latest SVN - Enable connection sharing diff --git a/sources b/sources index 70f1cc9..db9c113 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -25a1612c01ec19ba2864ad97ac98c759 NetworkManager-0.7.0.svn3747.tar.gz -4ae0a5d13783f4de4e4e6f7fb949aaed nm-applet-0.7.0.svn755.tar.gz +4abf623e95a5d2d7465a49786bbe289f NetworkManager-0.7.0.svn3801.tar.gz +b9c38044c9b3b25cf71306eb3810e4d4 nm-applet-0.7.0.svn774.tar.gz