From 1e23a5b03114c4153b8c25b9c5d3eae11da84e116985f4f782111c9126de56b8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 9 Apr 2024 16:26:08 +0000 Subject: [PATCH] - Avoid making /usr/share/doc/packages itself part of the RPM following a change in the %cmake macro OBS-URL: https://build.opensuse.org/package/show/games/prboom-plus?expand=0&rev=52 --- prboom-plus.changes | 6 ++++++ prboom-plus.spec | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/prboom-plus.changes b/prboom-plus.changes index c823d64..cd7f608 100644 --- a/prboom-plus.changes +++ b/prboom-plus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 9 16:25:32 UTC 2024 - Jan Engelhardt + +- Avoid making /usr/share/doc/packages itself part of the RPM + following a change in the %cmake macro + ------------------------------------------------------------------- Tue Apr 2 09:16:13 UTC 2024 - Jan Engelhardt diff --git a/prboom-plus.spec b/prboom-plus.spec index 4599381..151a95b 100644 --- a/prboom-plus.spec +++ b/prboom-plus.spec @@ -72,6 +72,7 @@ pushd prboom2/ popd %install +s="$PWD" pushd prboom2/ %cmake_install # convenience symlink @@ -81,6 +82,9 @@ install -Dm0644 ICONS/prboom-plus.svg "$b/%_datadir/icons/hicolor/scalable/apps/ install -Dm0644 ICONS/prboom-plus.desktop "$b/%_datadir/applications/prboom-plus.desktop" install -Dm0644 ICONS/prboom-plus.bash "$b/%_datadir/bash-completion/completions/prboom-plus.bash" popd +# TW switched doc location in %%cmake +(cd "%buildroot"; find "./%_datadir/doc" -type d -name prboom-plus | cut -b2-) >"$s/doc.files" +ls -al "$s/doc.files" %if 0%{?suse_version} && 0%{?suse_version} < 1550 %post @@ -92,10 +96,9 @@ popd %icon_theme_cache_postun %endif -%files +%files -f doc.files %_bindir/* %_datadir/doom/ -%_datadir/doc/packages/prboom* %_mandir/*/* %_datadir/applications/prboom-plus.desktop %_datadir/icons/hicolor/scalable/apps/prboom-plus.svg