From 66969bbb2c5aae0ba6e64f29199c60c6c5dfa416b23a3c157cc641c0da57007d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 28 Feb 2024 22:25:05 +0000 Subject: [PATCH] Accepting request 1153032 from home:jaimeMF:branches:graphics - Align path for document installation between openSUSE versions. OBS-URL: https://build.opensuse.org/request/show/1153032 OBS-URL: https://build.opensuse.org/package/show/graphics/SDL_bgi?expand=0&rev=64 --- SDL_bgi.changes | 5 +++++ SDL_bgi.spec | 13 +++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/SDL_bgi.changes b/SDL_bgi.changes index dba4e06..71d549b 100644 --- a/SDL_bgi.changes +++ b/SDL_bgi.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 28 20:16:30 UTC 2024 - Jaime Marquínez Ferrándiz + +- Align path for document installation between openSUSE versions. + ------------------------------------------------------------------- Thu Dec 15 18:02:14 UTC 2022 - Jan Engelhardt diff --git a/SDL_bgi.spec b/SDL_bgi.spec index c23664f..7431f2e 100644 --- a/SDL_bgi.spec +++ b/SDL_bgi.spec @@ -1,7 +1,7 @@ # # spec file for package SDL_bgi # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -66,14 +66,15 @@ together. %autosetup -p1 %build -%cmake +%define build_args %{nil} +%if 0%{?suse_version} < 1600 +%define build_args -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name} +%endif +%cmake %{build_args} %cmake_build %install %cmake_install -b="%buildroot" -mkdir -p "$b/%_defaultdocdir" -mv "$b/%_datadir/doc/%name" "$b/%_defaultdocdir/" # just a forwarder and conflicts with xbgi rm -v "%buildroot/%_includedir/graphics.h" @@ -85,7 +86,7 @@ rm -v "%buildroot/%_includedir/graphics.h" %_libdir/libSDL_bgi.so.* %files -n libSDL_bgi-devel -%_defaultdocdir/%name/ +%_docdir/%name/ %_includedir/* %_libdir/libSDL_bgi.so %_mandir/man3/*