diff --git a/NetworkManager-0.6.5-fixup-internal-applet-build.patch b/NetworkManager-0.6.5-fixup-internal-applet-build.patch index 566a2c9..c72ec21 100644 --- a/NetworkManager-0.6.5-fixup-internal-applet-build.patch +++ b/NetworkManager-0.6.5-fixup-internal-applet-build.patch @@ -139,18 +139,17 @@ 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"\" \ -@@ -24,7 +28,9 @@ nm_connection_editor_SOURCES = \ - main.c - - nm_connection_editor_LDADD = \ -- $(top_builddir)/src/gconf-helpers/libgconf-helpers.la \ -+ ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ +@@ -29,7 +33,9 @@ nm_connection_editor_LDADD = \ + $(top_builddir)/src/gconf-helpers/libgconf-helpers.la \ + ${top_builddir}/src/wireless-security/libwireless-security.la \ + ${top_builddir}/src/utils/libutils.la \ +- $(NMA_LIBS) ++ $(NMA_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 \ - $(NMA_LIBS) ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la gladedir = $(datadir)/nm-applet -diff -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 = 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 --- 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 bd23a90..c791165 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -7,7 +7,7 @@ ExcludeArch: s390 s390x %define gtk2_version 2.12.0 %define wireless_tools_version 1:28-0pre9 -%define snapshot svn3181 +%define snapshot svn3204 Name: NetworkManager Summary: Network connection manager and user applications @@ -18,7 +18,7 @@ Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Source: %{name}-%{version}.%{snapshot}.tar.gz -Source1: nm-applet-%{version}.svn405.tar.gz +Source1: nm-applet-%{version}.svn429.tar.gz Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch Patch2: nm-applet-0.7.0-disable-stuff.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -228,13 +228,13 @@ fi %{_bindir}/nm-tool %{_libexecdir}/nm-dhcp-client.action %{_libdir}/libnm-util.so* -%{_libdir}/pppd/2.4.4/nm-pppd-plugin.so %{_mandir}/man1/* %{_mandir}/man8/* %dir %{_localstatedir}/run/NetworkManager %{_prefix}/libexec/nm-crash-logger %dir %{_datadir}/NetworkManager %{_datadir}/NetworkManager/gdb-cmd +%{_libdir}/pppd/2.4.4/nm-pppd-plugin.so %files gnome %defattr(-,root,root,0755) @@ -269,6 +269,9 @@ fi %changelog +* Fri Jan 4 2008 Dan Williams - 1:0.7.0-0.8.svn3204 +- Fix WPA passphrase hashing on big endian (PPC, Sparc, etc) (rh #426233) + * Tue Dec 18 2007 Dan Williams - 1:0.7.0-0.8.svn3181 - Fixes to work better with new libnl (rh #401761) diff --git a/sources b/sources index 222d57e..e2f047b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -df677883338197128bbaa998e8e68779 nm-applet-0.7.0.svn405.tar.gz -24912a34ae297b2e0a617b78fe144683 NetworkManager-0.7.0.svn3181.tar.gz +dac36bcb1109f871979a91a4a95fe3ef NetworkManager-0.7.0.svn3204.tar.gz +880f12c3a37b95bc1511f78ca436a7cc nm-applet-0.7.0.svn429.tar.gz