From 206a0576607bede71784603dd7d01aee52d933cbb0a600831332c2c4262df26d Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 3 May 2021 16:14:15 +0000
Subject: [PATCH] Accepting request 890079 from GNOME:Next

Scripted push from GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/890079
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=375
---
 mutter.changes | 11 +++++++++++
 mutter.spec    | 44 ++++++++++----------------------------------
 2 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/mutter.changes b/mutter.changes
index 181c284..09cc251 100644
--- a/mutter.changes
+++ b/mutter.changes
@@ -4,6 +4,17 @@ Fri Apr 23 00:47:06 UTC 2021 - Alynx Zhou <alynx.zhou@suse.com>
 - Rebase mutter-SLE-bsc984738-grab-display.patch and
   mutter-SLE-bell.patch.
 
+-------------------------------------------------------------------
+Sat Apr 17 07:12:04 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Fold libmutter-8-0 and mutter-data into the main package:
+  + SLPP does, despite the devel package, not make much sense.
+    Mutter is the GNOME Window Manager and parallel installation of
+    the library only gave a false sense of possibility, and often
+    resulted in upgrade issues (e.g. zypper not updating mutter).
+  + The -data package was hard-requiring the same mutter version,
+    which essentially means the split makes no sense.
+
 -------------------------------------------------------------------
 Sat Mar 20 16:46:58 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/mutter.spec b/mutter.spec
index 1e9f45c..7f46568 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -107,44 +107,23 @@ Requires:       zenity
 Provides:       windowmanager
 # Obsolete the now private typelib.
 Obsoletes:      typelib-1_0-Meta-3_0
+# libmutter-<n>-0 and mutter-data were folded into the main package after GNOME 40
+# The library is not realy usable decoupled from the mutter version, and offering to
+# parallel install it only gives a false sense of capability. A full GNOME Stack
+# has a matching gnome-shell, mutter, libmutter version.
+Obsoletes:      libmutter-8-0 <= %{version}
+# mutter-data was essentilly hard-required at the same version, as mutter requires
+# libmutter-<n>-0 (which has a soname bump at every major version change), libmutter
+# required mutter-data >= %{version} and mutter-data required mutter=%{version}.
+Obsoletes:      mutter-data <= %{version}
 
 %description
 Mutter is a window and compositing manager based on Clutter, forked
 from Metacity.
 
-%package -n %{libmutter}
-Summary:        Window and compositing manager based on Clutter
-# we need the gsettings schema; hopefully, they'll stay backwards compatible
-# (since we can't require = version, to not break SLPP)
-Group:          System/Libraries
-Requires:       %{name}-data >= %{version}
-# We need to obsolete the old mutter libs, as otherwise upgrading is impossible
-# This makes me believe we should probably fold libmutter into the main package
-# with the next update (3.30)
-Obsoletes:      libmutter-1-0
-Obsoletes:      libmutter0
-
-%description -n %{libmutter}
-Mutter is a window and compositing manager based on Clutter, forked
-from Metacity.
-
-This package contains a library for shared features.
-
-%package data
-Summary:        Data files for mutter, a window and compositing manager based on Clutter
-Group:          System/GUI/GNOME
-Requires:       %{name} = %{version}
-
-%description data
-Mutter is a window and compositing manager based on Clutter, forked
-from Metacity.
-
-This package contains data files needed by mutter and its library.
-
 %package devel
 Summary:        Development files for mutter, a window and compositing manager
 Group:          Development/Libraries/GNOME
-Requires:       %{libmutter} = %{version}
 Requires:       %{name} = %{version}
 
 %description devel
@@ -190,8 +169,7 @@ translation-update-upstream po mutter
 %find_lang %{name} %{?no_lang_C}
 %fdupes %{buildroot}%{_prefix}
 
-%post -n %{libmutter} -p /sbin/ldconfig
-%postun -n %{libmutter} -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 %files
 %license COPYING
@@ -216,13 +194,11 @@ translation-update-upstream po mutter
 %{_libdir}/mutter-%{api_major}/CoglPango-%{api_major}.typelib
 %{_libdir}/mutter-%{api_major}/Meta-%{api_major}.typelib
 
-%files -n %{libmutter}
 %{_libdir}/libmutter-%{api_major}.so.*
 %dir %{_libdir}/mutter-%{api_major}/
 # users of libmutter need this directory
 %dir %{_libdir}/mutter-%{api_major}/plugins/
 
-%files data
 # Do not depend on g-c-c just for a directory
 %dir %{_datadir}/gnome-control-center
 %dir %{_datadir}/gnome-control-center/keybindings