Hello community, here is the log from the commit of package NetworkManager for openSUSE:Factory checked in at Thu Aug 25 10:20:59 CEST 2011.
-------- --- NetworkManager/NetworkManager.changes 2011-06-09 16:35:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/NetworkManager/NetworkManager.changes 2011-08-24 18:29:27.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Aug 24 14:23:01 UTC 2011 - fcro...@suse.com + +- no longer package /var/run/NetworkManager, not used by NM + anymore. Package /var/lib/NetworkManager instead. +- Add systemd-network-config.patch: follow network configuration to + not start NM under systemd if it is disabled system-wide. +- enable systemd service for NetworkManager + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- systemd-network-config.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.lGzchL/_old 2011-08-25 10:11:47.000000000 +0200 +++ /var/tmp/diff_new_pack.lGzchL/_new 2011-08-25 10:11:47.000000000 +0200 @@ -20,7 +20,7 @@ Name: NetworkManager Url: http://www.gnome.org/projects/NetworkManager/ Version: 0.8.9997 -Release: 1 +Release: 2 License: GPLv2+ Group: Productivity/Networking/System Summary: Network Link Manager and User Applications @@ -30,6 +30,8 @@ Source99: NetworkManager-rpmlintrc # PATCH-FIX-UPSTREAM f15-branch.patch fcro...@novell.com -- all patches from f15 branch (mostly KDE compat) : git diff 0.9.0-rc3..f15 (latest f15 commit : de32d1b87174e33626cb30ac2567d4ae964879f4) Patch0: f15-branch.patch +# PATCH-FEATURE-OPENSUSE systemd-network-config.patch -- don't try to start NM under systemd if it is disabled in system configuration +Patch1: systemd-network-config.patch BuildRequires: fdupes BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc @@ -61,6 +63,7 @@ Requires: ppp Requires: sysconfig >= 0.71.1 Requires: wpa_supplicant >= 0.6.4 +%{systemd_requires} Provides: dhcdbd = 1.14 Obsoletes: dhcdbd < 1.14 Recommends: dnsmasq @@ -116,6 +119,7 @@ %setup -n %{name}-%{version} -q translation-update-upstream %patch0 -p1 +%patch1 -p1 %build #needed by patch0 @@ -143,6 +147,7 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/VPN mkdir -p $RPM_BUILD_ROOT/var/log/ +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/NetworkManager touch $RPM_BUILD_ROOT/var/log/NetworkManager mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/system-connections install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d/ @@ -151,6 +156,22 @@ %clean rm -rf "$RPM_BUILD_ROOT" +%post +if [ ! -e /var/lib/systemd/migrated/NetworkManager ]; then + /bin/systemctl enable NetworkManager.service > /dev/null 2>&1 || : + touch /var/lib/systemd/migrated/NetworkManager +fi +%service_add NetworkManager.service + +%preun +if [ $1 -eq 0 ]; then + rm -f /var/lib/systemd/migrated/NetworkManager +fi +%service_del_preun NetworkManager.service + +%postun +%service_del_postun NetworkManager.service + %post glib -p /sbin/ldconfig %postun glib -p /sbin/ldconfig @@ -166,7 +187,7 @@ %{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service %{_datadir}/polkit-1/actions/org.freedesktop.NetworkManager.policy -%attr(0700,root,root) %{_localstatedir}/run/NetworkManager +%attr(0700,root,root) %{_localstatedir}/lib/NetworkManager %doc %{_mandir}/man1/nm-online.* %doc %{_mandir}/man1/nm-tool.* %doc %{_mandir}/man1/nmcli.* ++++++ systemd-network-config.patch ++++++ Index: NetworkManager-0.8.9997/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 Type=dbus BusName=org.freedesktop.NetworkManager ExecStart=@sbindir@/NetworkManager --no-daemon +EnvironmentFile=/etc/sysconfig/network/config +ExecStartPre=/usr/bin/test "x${NETWORKMANAGER}" = xyes [Install] WantedBy=multi-user.target ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
