From 56abe601d3e1eb5db236cc6a32558c03a85b5578 Mon Sep 17 00:00:00 2001 From: Joshua Strobl Date: Sat, 5 Aug 2023 13:23:42 +0300 Subject: [PATCH] Split common mutter files into subpackage for consumption by soft-forks without creating conflicts --- mutter.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/mutter.spec b/mutter.spec index 988fa64..3d03ce3 100644 --- a/mutter.spec +++ b/mutter.spec @@ -95,6 +95,9 @@ Requires: pipewire%{_isa} >= %{pipewire_version} Requires: startup-notification Requires: dbus +# Need common +Requires: %{name}-common = %{version}-%{release} + Recommends: mesa-dri-drivers%{?_isa} Provides: firstboot(windowmanager) = mutter @@ -104,6 +107,8 @@ Provides: firstboot(windowmanager) = mutter Provides: bundled(cogl) = 1.22.0 Provides: bundled(clutter) = 1.26.0 +Conflicts: mutter < 45~beta.1-2 + %description Mutter is a window and compositing manager that displays and manages your desktop via OpenGL. Mutter combines a sophisticated display engine @@ -116,6 +121,14 @@ this reason, Mutter is very extensible via plugins, which are used both to add fancy visual effects and to rework the window management behaviors to meet the needs of the environment. +%package common +Summary: Common files used by %{name} and forks of %{name} +BuildArch: noarch +Conflicts: mutter < 45~beta.1-2 + +%description common +Common files used by Mutter and soft forks of Mutter + %package devel Summary: Development package for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -156,11 +169,13 @@ the functionality of the installed %{name} package. %{_libdir}/mutter-%{mutter_api_version}/ %{_libexecdir}/mutter-restart-helper %{_libexecdir}/mutter-x11-frames +%{_mandir}/man1/mutter.1* + +%files common %{_datadir}/GConf/gsettings/mutter-schemas.convert %{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.mutter.wayland.gschema.xml %{_datadir}/gnome-control-center/keybindings/50-mutter-*.xml -%{_mandir}/man1/mutter.1* %{_udevrulesdir}/61-mutter.rules %files devel