- merged from DEVEL

Changed files:
    NetworkManager-pld.patch -> 1.14
    NetworkManager.spec -> 1.67

diff --git a/NetworkManager-pld.patch b/NetworkManager-pld.patch
index 5895816536ed51b5891f1a4678777d215ce8dbb2..059964248779b03210fb2d7e9ea6a9322ac82d3f 100644 (file)
--- a/NetworkManager-pld.patch
+++ b/NetworkManager-pld.patch
@@ -149,20 +149,19 @@ diff -urN NetworkManager-0.7.2/initscript/PLD/NetworkManager.in NetworkManager-0
 +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 @@ diff -urN NetworkManager-0.7.2/src/backends/NetworkManagerPLD.c NetworkManager-0
 +#include <stdlib.h>
 +
 +#include "NetworkManagerGeneric.h"
-+#include "NetworkManagerSystem.h"
++#include "nm-system.h"
 +#include "NetworkManagerUtils.h"
 +
 +/*

diff --git a/NetworkManager.spec b/NetworkManager.spec
index bbd5fcd2756521c8f3582c5d2d8b354c2fa9cac7..7ab807e8ed35bfc86fa56123ddd11be369f15265 100644 (file)
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -4,12 +4,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/
@@ -83,6 +83,7 @@ Group:                Development/Libraries
 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.
@@ -162,6 +163,7 @@ fi
 %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
@@ -182,8 +184,11 @@ fi
 %{_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