diff --git a/wcm.changes b/wcm.changes index 763ff42..7c405c4 100644 --- a/wcm.changes +++ b/wcm.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jan 7 18:01:56 UTC 2025 - Shawn Dunn + +- Add -Denable_wldisplays=false to build. + * wdisplays is already packaged and available in :Factory, added + Requires: to package for the already packaged wdisplays +- Remove deprecated %suse_update_desktop_file from the %install + section + ------------------------------------------------------------------- Sun Jan 5 17:43:04 UTC 2025 - Shawn Dunn diff --git a/wcm.spec b/wcm.spec index b11cb82..6d46ea9 100644 --- a/wcm.spec +++ b/wcm.spec @@ -40,6 +40,7 @@ BuildRequires: pkgconfig(wlroots) >= 0.17.0 BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-protocols) Requires: wayfire >= %{major_ver} +Requires: wdisplays >= %{major_ver} %description Wayfire Config Manager https://wayfire.org/. @@ -49,12 +50,12 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE1} | grep -Eo '^[0-9a-f]+'` %{SOU %autosetup -p1 %build -%meson +# Disable including wdisplays. It's already packaged in Factory, added Requires: for the distro package +%meson -Denable_wdisplays=false %meson_build %install %meson_install -%suse_update_desktop_file -G -r wayfire-config-manager "Wayfire Config Manager" "Settings;DesktopSettings" %check %meson_test @@ -62,7 +63,7 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE1} | grep -Eo '^[0-9a-f]+'` %{SOU %files %license LICENSE %{_bindir}/%{name} -%{_bindir}/wdisplays +%dnl %{_bindir}/wdisplays %{_datadir}/wayfire/icons %{_datadir}/icons/hicolor/* %{_datadir}/applications/*.desktop