From 8cc90001be4b8b70a9267df0ee90132f91bd3b86 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 4 Mar 2020 14:18:53 +0100 Subject: [PATCH] Fix cmake module install path --- quazip-0.7.6-install-right-prefix.patch | 2 +- quazip.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/quazip-0.7.6-install-right-prefix.patch b/quazip-0.7.6-install-right-prefix.patch index 39946ff..3ad2ac4 100644 --- a/quazip-0.7.6-install-right-prefix.patch +++ b/quazip-0.7.6-install-right-prefix.patch @@ -19,4 +19,4 @@ index 539caa4..a43fefe 100644 add_subdirectory(quazip) -install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION ${CMAKE_ROOT}/Modules) -+install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION share/cmake) ++install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION ${SHARE_INSTALL_PREFIX}/cmake/Modules) diff --git a/quazip.spec b/quazip.spec index e404f74..9e5d78c 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.7.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: https://github.com/stachenov/quazip @@ -97,7 +97,7 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %doc doc/html %{_includedir}/quazip/ %{_libdir}/libquazip.so -%{_datadir}/cmake/FindQuaZip.cmake +%{_datadir}/cmake/Modules/FindQuaZip.cmake %files qt5 %doc NEWS.txt README.md @@ -108,10 +108,13 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %doc doc/html %{_includedir}/quazip5/ %{_libdir}/libquazip5.so -%{_datadir}/cmake/FindQuaZip5.cmake +%{_datadir}/cmake/Modules/FindQuaZip5.cmake %changelog +* Wed Mar 04 2020 Sandro Mani - 0.7.6-7 +- Fix cmake module install path + * Thu Jan 30 2020 Fedora Release Engineering - 0.7.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild