Hello community,
here is the log from the commit of package NetworkManager for openSUSE:Factory
checked in at Wed Aug 31 10:21:23 CEST 2011.
--------
--- NetworkManager/NetworkManager.changes 2011-08-25 13:33:02.000000000
+0200
+++ /mounts/work_src_done/STABLE/NetworkManager/NetworkManager.changes
2011-08-30 19:04:39.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Aug 30 16:57:28 UTC 2011 - fcro...@suse.com
+
+- Add empty systemd macro to fix build on 11.4
+- Update systemd-network-config.patch to disable dbus activation
+ for NetworkManager, it was causing KDE timeout when NM was not
+ handling network (bnc#714962).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager.spec ++++++
--- /var/tmp/diff_new_pack.HDqezJ/_old 2011-08-31 10:20:39.000000000 +0200
+++ /var/tmp/diff_new_pack.HDqezJ/_new 2011-08-31 10:20:39.000000000 +0200
@@ -16,11 +16,14 @@
#
+%if 0%{suse_version} <= 1140
+%define systemd_requires %{nil}
+%endif
Name: NetworkManager
Url: http://www.gnome.org/projects/NetworkManager/
Version: 0.9.0
-Release: 1
+Release: 2
License: GPLv2+
Group: Productivity/Networking/System
Summary: Network Link Manager and User Applications
@@ -153,6 +156,8 @@
%clean
rm -rf "$RPM_BUILD_ROOT"
+%if 0%{suse_version} > 1140
+
%post
if [ ! -e /var/lib/systemd/migrated/NetworkManager ]; then
/bin/systemctl enable NetworkManager.service > /dev/null 2>&1 || :
@@ -168,6 +173,7 @@
%postun
%service_del_postun NetworkManager.service
+%endif
%post glib -p /sbin/ldconfig
++++++ systemd-network-config.patch ++++++
--- /var/tmp/diff_new_pack.HDqezJ/_old 2011-08-31 10:20:39.000000000 +0200
+++ /var/tmp/diff_new_pack.HDqezJ/_new 2011-08-31 10:20:39.000000000 +0200
@@ -1,8 +1,8 @@
-Index: NetworkManager-0.8.9997/data/NetworkManager.service.in
+Index: NetworkManager-0.9.0/data/NetworkManager.service.in
===================================================================
---- NetworkManager-0.8.9997.orig/data/NetworkManager.service.in
-+++ NetworkManager-0.8.9997/data/NetworkManager.service.in
-@@ -8,6 +8,8 @@ Before=network.target
+--- NetworkManager-0.9.0.orig/data/NetworkManager.service.in
++++ NetworkManager-0.9.0/data/NetworkManager.service.in
+@@ -8,7 +8,8 @@ Before=network.target
Type=dbus
BusName=org.freedesktop.NetworkManager
ExecStart=@sbindir@/NetworkManager --no-daemon
@@ -11,3 +11,4 @@
[Install]
WantedBy=multi-user.target
+-Alias=dbus-org.freedesktop.NetworkManager.service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
