Hello community,
here is the log from the commit of package NetworkManager for openSUSE:Factory
checked in at 2019-05-22 10:56:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager (Old)
and /work/SRC/openSUSE:Factory/.NetworkManager.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager"
Wed May 22 10:56:49 2019 rev:197 rq:704415 version:1.16.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/NetworkManager/NetworkManager.changes
2019-04-03 09:23:44.495694761 +0200
+++ /work/SRC/openSUSE:Factory/.NetworkManager.new.5148/NetworkManager.changes
2019-05-22 10:56:51.718965386 +0200
@@ -1,0 +2,11 @@
+Tue May 21 07:38:18 UTC 2019 - Jonathan Kang <sck...@suse.com>
+
+- Avoid using "systemctl enable" in spec file (bsc#1038403).
+
+-------------------------------------------------------------------
+Fri May 17 09:13:12 UTC 2019 - Jonathan Kang <sck...@suse.com>
+
+- Remove legacy checks which fixes bnc#803058 during distribution
+ upgrade from 12.2 to 12.3 in .spec file.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager.spec ++++++
--- /var/tmp/diff_new_pack.9M44jI/_old 2019-05-22 10:56:54.062963355 +0200
+++ /var/tmp/diff_new_pack.9M44jI/_new 2019-05-22 10:56:54.086963334 +0200
@@ -305,33 +305,6 @@
%post
%service_add_post NetworkManager.service NetworkManager-dispatcher.service
-# enable NetworkManager-dispatcher, it's a DBus enabled service
-systemctl enable NetworkManager-dispatcher.service
-# bnc#803058:
-# sysconfig creates this file while update from openSUSE < 12.3,
-# which were using the NETWORKMANAGER=yes/no sysconfig variable.
-# When it exists and NETWORKMANAGER were enabled, force enable to
-# ensure, the network.service alias link exists points to us.
-if [ -f /dev/.sysconfig/network/migrate_nm_variable ] ; then
- . /dev/.sysconfig/network/migrate_nm_variable
- if [ "X$NETWORKMANAGER" = "Xyes" ] ; then
- # In running system "--force enable" is sufficient to
- # create the network.service alias link regardless if
- # the network.service is masked or not.
- # While 12.2 -> 12.3 dist update, enable seems to be
- # unable to create the alias... no idea why. Kick it
- rm -f %{_sysconfdir}/systemd/system/network.service
- %{_bindir}/systemctl --system daemon-reload || :
- %{_bindir}/systemctl --force enable NetworkManager.service || :
- # and create the alias when enable failed to make it.
- if [ ! -e %{_sysconfdir}/systemd/system/network.service ] ; then
- ln -sf %{_unitdir}/NetworkManager.service \
- %{_sysconfdir}/systemd/system/network.service
- fi
- %{_bindir}/systemctl --system daemon-reload || :
- fi
- rm -f /dev/.sysconfig/network/migrate_nm_variable
-fi
%preun
%service_del_preun NetworkManager.service NetworkManager-dispatcher.service
