Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package NetworkManager for openSUSE:Factory
checked in at 2022-05-25 20:34:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager (Old)
and /work/SRC/openSUSE:Factory/.NetworkManager.new.2254 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager"
Wed May 25 20:34:06 2022 rev:241 rq:979001 version:1.38.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/NetworkManager/NetworkManager.changes
2022-05-18 13:12:48.178642186 +0200
+++ /work/SRC/openSUSE:Factory/.NetworkManager.new.2254/NetworkManager.changes
2022-05-25 20:34:18.332206150 +0200
@@ -1,0 +2,11 @@
+Tue May 24 14:23:15 UTC 2022 - Dominique Leuenberger <dims...@opensuse.org>
+
+- Fold NetworkManager-wifi back into the main package: The dep
+ chain is not really different and it causes too many problems for
+ users having that split. Not worth the pain (boo#1199710,
+ boo#1199706).
+- As a consequence, also drop the recommends fro the main package
+ to -wifi.
+
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager.spec ++++++
--- /var/tmp/diff_new_pack.RCEzDq/_old 2022-05-25 20:34:19.000207083 +0200
+++ /var/tmp/diff_new_pack.RCEzDq/_new 2022-05-25 20:34:19.008207094 +0200
@@ -95,6 +95,7 @@
BuildRequires: python3-dbus-python
BuildRequires: readline-devel
BuildRequires: rp-pppoe
+BuildRequires: wireless-tools
BuildRequires: perl(YAML)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(dbus-glib-1) >= 0.94
@@ -137,9 +138,6 @@
Recommends: iptables
Recommends: iputils
Recommends: org.freedesktop.ModemManager
-# Recommend -wifi. Preferably it should be auto-triggered for install
-# when a wifi chip is found, but that is not yet implemented (boo#1199550)
-Recommends: %{name}-wifi
# Provides required by sysconfig. The latter is used by older versions.
Provides: dhcdbd = 1.14
Provides: service(network)
@@ -148,6 +146,12 @@
Obsoletes: libnm-glib-vpn1 < 1.32
Obsoletes: libnm-glib4 < 1.32
Obsoletes: libnm-util2 < 1.32
+# NetworkManager-wifi was folded back into the main package
+# The dep chain is not really different and it causes too many
+# problems for users having that split. Not worth the pain
+Provides: NetworkManager-wifi = %{version}
+Obsoletes: NetworkManager-wifi <= %{version}
+
%{?systemd_ordering}
%description
@@ -231,16 +235,6 @@
%description bluetooth
This package contains NetworkManager support for Bluetooth devices.
-%package wifi
-Summary: Wifi plugin for NetworkManager
-Group: System Environment/Base
-BuildRequires: wireless-tools
-Requires: %{name} = %{version}
-Requires: wpa_supplicant >= 0.6.4
-
-%description wifi
-This package contains NetworkManager support for Wifi and OLPC devices.
-
%package wwan
Summary: Mobile broadband device plugin for NetworkManager
Group: System Environment/Base
@@ -414,6 +408,7 @@
%{_mandir}/man8/nm-initrd-generator.8%{?ext_man}
%dir %{_libdir}/NetworkManager
%dir %{_libdir}/NetworkManager/%{version}
+%{_libdir}/NetworkManager/%{version}/libnm-device-plugin-wifi.so
%{_libexecdir}/nm-daemon-helper
%{_libexecdir}/nm-dhcp-helper
%{_libexecdir}/nm-dispatcher
@@ -480,9 +475,6 @@
%files bluetooth
%{_libdir}/NetworkManager/%{version}/libnm-device-plugin-bluetooth.so
-%files wifi
-%{_libdir}/NetworkManager/%{version}/libnm-device-plugin-wifi.so
-
%files wwan
%{_libdir}/NetworkManager/%{version}/libnm-device-plugin-wwan.so
%{_libdir}/NetworkManager/%{version}/libnm-wwan.so
