From 0e213f871785c52bba1f210cb611e103d23154d5634d0cad4e1aeffadec17c04 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Wed, 16 Aug 2023 13:45:49 +0000 Subject: [PATCH] - Add subpackage river-contrib. OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/river?expand=0&rev=28 --- river.changes | 5 +++++ river.spec | 23 ++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/river.changes b/river.changes index 790045e..8827c66 100644 --- a/river.changes +++ b/river.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 16 13:43:16 UTC 2023 - Soc Virnyl Estela + +- Add subpackage river-contrib. + ------------------------------------------------------------------- Sun Aug 13 13:26:50 UTC 2023 - Soc Virnyl Estela diff --git a/river.spec b/river.spec index ead9af4..22ad72c 100644 --- a/river.spec +++ b/river.spec @@ -54,6 +54,7 @@ Recommends: libqt5-qtwayland Recommends: libqt5-qtwayland-32bit Requires: river-riverctl Requires: river-rivertile +Recommends: river-contrib Suggests: xdg-desktop-portal-wlr ExclusiveArch: x86_64 aarch64 riscv64 %{mips64} @@ -120,19 +121,34 @@ BuildArch: noarch %description bash-completion Bash command-line completion support for %{name}. +%package contrib +Summary: Helper files for making river easy to use +Supplements: (%{name} and river) +Requires: river +BuildArch: noarch + +%description contrib +This package contains files that make river easier to use such as +listing it to a Display Manager such as GDM with a desktop file or +setting up sane environmental variables before running river in +`river.sh`. These files are not part of the river project. + %build %zig_build -Dpie -Dxwayland %install mkdir -p %{buildroot}%{_datadir}/wayland-sessions +mkdir -p %{buildroot}%{_datadir}/river %zig_install -Dpie -Dxwayland # Installing the desktop file for easy login manager access sed -i 's|Exec=river|Exec=river-run.sh|' contrib/river.desktop install -D -m 0644 contrib/river.desktop %{buildroot}%{_datadir}/wayland-sessions +cp -rv contrib %{buildroot}%{_datadir}/river/contrib +cp -Dm 0755 %{SOURCE1} %{buildroot}%{_datadir}/river/contrib/ # Install convenient script to run river -install -D -m 0755 %{SOURCE1} %{buildroot}%{_bindir} +install -Dm 0755 %{SOURCE1} %{buildroot}%{_bindir} %files %license LICENSE @@ -171,4 +187,9 @@ install -D -m 0755 %{SOURCE1} %{buildroot}%{_bindir} %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_riverctl +%files contrib +%dir %{_datadir}/river +%dir %{_datadir}/river/contrib +%{_datadir}/river/contrib/* + %changelog