From 00a1d89f7e88f6f34ba29e5206b28dc462470b605bc2d32fd8bf86990ebc3d2c Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Thu, 18 Jan 2024 12:22:02 +0000 Subject: [PATCH] Accepting request 1139691 from home:Thaodan:branches:devel:tools:building - macros: Set some more variables notable %{_docdir} so that GNUInstallDirs works fully on openSUSE. Packages using CMAKE_INSTALL_DOCDIR fail otherwise. OBS-URL: https://build.opensuse.org/request/show/1139691 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=566 --- cmake.changes | 6 ++++++ cmake.macros | 3 +++ cmake.spec | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/cmake.changes b/cmake.changes index 7a43dc0..6ebac68 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 17 19:54:04 UTC 2024 - Björn Bidar + +- macros: Set some more variables notable %{_docdir} so that GNUInstallDirs + works fully on openSUSE. Packages using CMAKE_INSTALL_DOCDIR fail otherwise. + ------------------------------------------------------------------- Thu Jan 11 10:21:03 UTC 2024 - Michal Suchanek diff --git a/cmake.macros b/cmake.macros index a1e312b..9241ec7 100644 --- a/cmake.macros +++ b/cmake.macros @@ -32,6 +32,9 @@ -DCMAKE_INSTALL_LIBDIR:PATH=%{__cmake_make_prefix_relative %{_libdir}} \\\ -DCMAKE_INSTALL_INCLUDEDIR:PATH=%{__cmake_make_prefix_relative %{_includedir}} \\\ -DCMAKE_INSTALL_DATAROOTDIR:PATH=%{__cmake_make_prefix_relative %{_datadir}} \\\ + -DCMAKE_INSTALL_DOCDIR:PATH=%{__cmake_make_prefix_relative %{_docdir}/%{name}} \\\ + -DCMAKE_INSTALL_MANDIR:PATH=%{__cmake_make_prefix_relative %{_mandir}} \\\ + -DCMAKE_INSTALL_INFODIR:PATH=%{__cmake_make_prefix_relative %{_infodir}} \\\ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ diff --git a/cmake.spec b/cmake.spec index 0004479..238e965 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2023 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