packages: NetworkManager/NetworkManager.spec, NetworkManager/NetworkManager...

[megabajt]

Author: megabajt                     Date: Thu Jul 29 16:32:42 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/NetworkManager:
   NetworkManager.spec (1.66 -> 1.67) , NetworkManager-pld.patch (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: packages/NetworkManager/NetworkManager.spec
diff -u packages/NetworkManager/NetworkManager.spec:1.66 packages/NetworkManager/NetworkManager.spec:1.67
--- packages/NetworkManager/NetworkManager.spec:1.66	Fri May 28 21:37:53 2010
+++ packages/NetworkManager/NetworkManager.spec	Thu Jul 29 18:32:37 2010
@@ -5,12 +5,12 @@
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager
-Version:	0.8
-Release:	3
+Version:	0.8.1
+Release:	1
 License:	GPL v2
 Group:		Networking/Admin
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.8/%{name}-%{version}.tar.bz2
-# Source0-md5:	d343e22f132754696654511acde354c2
+# Source0-md5:	96e551149dda8f6e0a5621f77468ba79
 Source1:	%{name}-system-settings.conf
 Patch0:		%{name}-pld.patch
 URL:		http://projects.gnome.org/NetworkManager/
@@ -84,6 +84,7 @@
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	dbus-glib-devel >= 0.75
 Requires:	libuuid-devel
+Requires:	udev-glib-devel
 
 %description devel
 Network Manager includes and more.
@@ -163,6 +164,7 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/nm-tool
+%attr(755,root,root) %{_bindir}/nmcli
 %attr(755,root,root) %{_sbindir}/NetworkManager
 %dir %{_libdir}/NetworkManager
 %attr(755,root,root) %{_libexecdir}/nm-crash-logger
@@ -183,8 +185,11 @@
 %{_datadir}/polkit-1/actions/org.freedesktop.network-manager-settings.system.policy
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
 %{_datadir}/%{name}/gdb-cmd
-%{_mandir}/man8/NetworkManager.8*
 %{_mandir}/man1/nm-tool.1*
+%{_mandir}/man1/nmcli.1*
+%{_mandir}/man5/NetworkManager.conf.5*
+%{_mandir}/man5/nm-system-settings.conf.5*
+%{_mandir}/man8/NetworkManager.8*
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-dhcp-client.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-avahi-autoipd.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-dispatcher.conf
@@ -231,6 +236,16 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2010/07/29 16:32:37  megabajt
+- merged from DEVEL
+
+Revision 1.66.2.2  2010/07/29 14:24:05  megabajt
+- updated to 0.8.1
+- added R: udev-glib-devel to -devel subpackage
+
+Revision 1.66.2.1  2010/05/30 15:39:55  arvenil
+- up to 0.8.0.998 (not tested yet)
+
 Revision 1.66  2010/05/28 19:37:53  megabajt
 - install pppd plugin to proper directory
 - release 3

================================================================
Index: packages/NetworkManager/NetworkManager-pld.patch
diff -u packages/NetworkManager/NetworkManager-pld.patch:1.13 packages/NetworkManager/NetworkManager-pld.patch:1.14
--- packages/NetworkManager/NetworkManager-pld.patch:1.13	Mon Apr 26 13:54:16 2010
+++ packages/NetworkManager/NetworkManager-pld.patch	Thu Jul 29 18:32:37 2010
@@ -149,20 +149,19 @@
 +esac
 +	        
 +exit $RETVAL
-diff -urN NetworkManager-0.7.2/src/backends/Makefile.am NetworkManager-0.7.2.new/src/backends/Makefile.am
---- NetworkManager-0.7.2/src/backends/Makefile.am	2009-11-23 20:17:47.000000000 +0100
-+++ NetworkManager-0.7.2.new/src/backends/Makefile.am	2009-11-26 22:08:06.086054252 +0100
-@@ -49,6 +49,10 @@
- libnmbackend_la_SOURCES += NetworkManagerMandriva.c
- endif
+--- NetworkManager-0.8.0.998/src/backends/Makefile.am	2010-05-22 18:35:03.000000000 +0000
++++ NetworkManager-0.8.0.998/src/backends/Makefile.am	2010-05-30 14:21:03.000000000 +0000
+@@ -14,6 +14,10 @@
+ 
+ libnmbackend_la_LIBADD =
  
 +if TARGET_PLD
 +libnmbackend_la_SOURCES += NetworkManagerPLD.c
 +endif
 +
- libnmbackend_la_LIBADD += $(DBUS_LIBS) $(GLIB_LIBS)
- libnmbackend_la_CPPFLAGS =	$(DBUS_CFLAGS)				\
- 					$(GLIB_CFLAGS)				\
+ if TARGET_REDHAT
+ libnmbackend_la_SOURCES += NetworkManagerRedHat.c
+ endif
 diff -urN NetworkManager-0.7.2/src/backends/NetworkManagerPLD.c NetworkManager-0.7.2.new/src/backends/NetworkManagerPLD.c
 --- NetworkManager-0.7.2/src/backends/NetworkManagerPLD.c	1970-01-01 01:00:00.000000000 +0100
 +++ NetworkManager-0.7.2.new/src/backends/NetworkManagerPLD.c	2009-11-26 22:10:12.232724504 +0100
@@ -201,7 +200,7 @@
 +#include <stdlib.h>
 +
 +#include "NetworkManagerGeneric.h"
-+#include "NetworkManagerSystem.h"
++#include "nm-system.h"
 +#include "NetworkManagerUtils.h"
 +
 +/*
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NetworkManager/NetworkManager.spec?r1=1.66&r2=1.67&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NetworkManager/NetworkManager-pld.patch?r1=1.13&r2=1.14&f=u