rpms/NetworkManager/F-8 .cvsignore, 1.74, 1.75 NetworkManager-0.6.5-fixup-internal-applet-build.patch, 1.9, 1.10 NetworkManager.spec, 1.199, 1.200 sources, 1.93, 1.94

Fri Jan 4 18:51:49 UTC 2008

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19379

Modified Files:
	.cvsignore 
	NetworkManager-0.6.5-fixup-internal-applet-build.patch 
	NetworkManager.spec sources 
Log Message:
* Fri Jan  4 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.7.svn3204
- Fix WPA passphrase hashing on big endian (PPC, Sparc, etc) (rh #426233)
- Fixes to work with libnl-1.0-pre8 (rh #401761)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75

--- .cvsignore	5 Dec 2007 18:14:30 -0000	1.74
+++ .cvsignore	4 Jan 2008 18:51:09 -0000	1.75
@@ -63,3 +63,5 @@
 nm-applet-0.7.0.svn378.tar.gz
 NetworkManager-0.7.0.svn3138.tar.gz
 nm-applet-0.7.0.svn383.tar.gz
+NetworkManager-0.7.0.svn3204.tar.gz
+nm-applet-0.7.0.svn429.tar.gz

NetworkManager-0.6.5-fixup-internal-applet-build.patch:

Index: NetworkManager-0.6.5-fixup-internal-applet-build.patch
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/NetworkManager-0.6.5-fixup-internal-applet-build.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- NetworkManager-0.6.5-fixup-internal-applet-build.patch	15 Nov 2007 21:52:03 -0000	1.9
+++ NetworkManager-0.6.5-fixup-internal-applet-build.patch	4 Jan 2008 18:51:09 -0000	1.10
@@ -139,18 +139,17 @@
  nm_connection_editor_CPPFLAGS =			\
  	$(NMA_CFLAGS)				\
  	-DICONDIR=\""$(datadir)/icons"\"	\
-@@ -25,7 +29,9 @@ nm_connection_editor_SOURCES =	\
- 
- nm_connection_editor_LDADD = \
- 	$(NMA_LIBS) \
--	${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
  
  gladedir = $(datadir)/nm-applet
- glade_DATA = nm-connection-editor.glade
-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=


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/NetworkManager.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- NetworkManager.spec	5 Dec 2007 18:14:30 -0000	1.199
+++ NetworkManager.spec	4 Jan 2008 18:51:09 -0000	1.200
@@ -7,18 +7,18 @@
 %define gtk2_version	2.12.0
 %define wireless_tools_version 1:28-0pre9
 
-%define snapshot svn3138
+%define snapshot svn3204
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.6.6.%{snapshot}%{?dist}
+Release: 0.6.7.%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.svn383.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)
@@ -170,9 +170,8 @@
 %find_lang nm-applet
 cat nm-applet.lang >> %{name}.lang
 
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/NetworkManager/nm-pppd-plugin.* $RPM_BUILD_ROOT%{_libdir}/
-
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.4.4/*.la
 
 # Remove system settings daemon for now
 %{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/nm-system-settings.conf
@@ -228,13 +227,13 @@
 %{_bindir}/nm-tool
 %{_libexecdir}/nm-dhcp-client.action
 %{_libdir}/libnm-util.so*
-%{_libdir}/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 +268,10 @@
 
 
 %changelog
+* Fri Jan  4 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.7.svn3204
+- Fix WPA passphrase hashing on big endian (PPC, Sparc, etc) (rh #426233)
+- Fixes to work with libnl-1.0-pre8 (rh #401761)
+
 * Wed Dec  5 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.6.svn3138
 - Fix applet connection comparison which failed to send connection updated
     signals to NM in some cases


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/sources,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- sources	5 Dec 2007 18:14:30 -0000	1.93
+++ sources	4 Jan 2008 18:51:09 -0000	1.94
@@ -1,2 +1,2 @@
-d4a7d986b0fe5eb839ae6467ac49f0f5  NetworkManager-0.7.0.svn3138.tar.gz
-cf8070b1dc9af7106c28327b01558511  nm-applet-0.7.0.svn383.tar.gz
+dac36bcb1109f871979a91a4a95fe3ef  NetworkManager-0.7.0.svn3204.tar.gz
+880f12c3a37b95bc1511f78ca436a7cc  nm-applet-0.7.0.svn429.tar.gz


