From 8f70e89d4ec6eb18a9c9cddd8a82bd708a322e6d4b25165810d3e87ff43f36da Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 24 Jul 2020 06:14:49 +0000 Subject: [PATCH] Accepting request 822366 from home:dimstar:Factory - Install the rpm provides handler to the correct location (%{_rpmconfigdir, not %{_libexecdir}). OBS-URL: https://build.opensuse.org/request/show/822366 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=421 --- cmake.changes | 6 ++++++ cmake.spec | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cmake.changes b/cmake.changes index fe3ac06..8738248 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 23 10:38:42 UTC 2020 - Dominique Leuenberger + +- Install the rpm provides handler to the correct location + (%{_rpmconfigdir, not %{_libexecdir}). + ------------------------------------------------------------------- Thu Jul 16 15:36:16 UTC 2020 - Christoph G diff --git a/cmake.spec b/cmake.spec index 644f87a..10e1807 100644 --- a/cmake.spec +++ b/cmake.spec @@ -170,8 +170,8 @@ find %{buildroot}%{_datadir}/cmake -type f -print0 | xargs -0 chmod 644 install -m644 %{SOURCE1} -D %{buildroot}%{_rpmconfigdir}/macros.d/macros.cmake # RPM auto provides -install -p -m0644 -D %{SOURCE3} %{buildroot}%{_libexecdir}/rpm/fileattrs/cmake.attr -install -p -m0755 -D %{SOURCE4} %{buildroot}%{_libexecdir}/rpm/cmake.prov +install -p -m0644 -D %{SOURCE3} %{buildroot}%{_fileattrsdir}/cmake.attr +install -p -m0755 -D %{SOURCE4} %{buildroot}%{_rpmconfigdir}/cmake.prov # fix: W: files-duplicate (%%license covers already) rm %{buildroot}%{_docdir}/cmake/Copyright.txt @@ -215,7 +215,8 @@ rm %{buildroot}%{_docdir}/cmake/Copyright.txt %license Copyright.txt %doc README.rst %{_rpmconfigdir}/macros.d/macros.cmake -%{_libexecdir}/rpm +%{_fileattrsdir}/cmake.attr +%{_rpmconfigdir}/cmake.prov %{_bindir}/cpack %{_bindir}/cmake %{_bindir}/ctest