diff --git a/0002-use-GNUInstallDirs-for-libs.patch b/0002-use-GNUInstallDirs-for-libs.patch new file mode 100644 index 0000000000000000000000000000000000000000..50c8c903bf6c3b7c30af5f7ac4cca29d23f21f06 --- /dev/null +++ b/0002-use-GNUInstallDirs-for-libs.patch @@ -0,0 +1,53 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0b5dfb4..1777376 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,6 +16,8 @@ if (GCOV STREQUAL "ON") + set(CLIBCNI_GCOV "ON") + endif() + ++include(GNUInstallDirs) ++ + # check depends libs and headers + include(cmake/checker.cmake) + if (CHECKER_RESULT) +@@ -38,6 +40,7 @@ configure_file( + configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/clibcni.pc.in" + "${CMAKE_BINARY_DIR}/conf/clibcni.pc" ++ @ONLY + ) + + # build which type of clibcni library +@@ -53,7 +56,7 @@ endif() + if (LIB_INSTALL_DIR) + set(LIB_INSTALL_DIR_DEFAULT ${LIB_INSTALL_DIR}) + else() +- set(LIB_INSTALL_DIR_DEFAULT "lib") ++ set(LIB_INSTALL_DIR_DEFAULT ${CMAKE_INSTALL_LIBDIR}) + endif() + + # set libisula compile flags +diff --git a/clibcni.pc.in b/clibcni.pc.in +index 626a242..1b66623 100644 +--- a/clibcni.pc.in ++++ b/clibcni.pc.in +@@ -1,12 +1,12 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_PREFIX@/lib +-localstatedir=@CMAKE_INSTALL_PREFIX@/var +-includedir=@CMAKE_INSTALL_PREFIX@/include ++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ ++localstatedir=@CMAKE_INSTALL_FULL_LOCALSTATEDIR@ ++includedir=${prefix}/include + + Name: libclibcni + Description: c library of cni + Version: @CLIBCNI_VERSION@ +-URL: clibcni +-Libs: -L@CMAKE_INSTALL_PREFIX@/lib -lclibcni +-Cflags: -I@CMAKE_INSTALL_PREFIX@/include ++URL: https://gitee.com/openeuler/clibcni ++Libs: -L${libdir} -lclibcni ++Cflags: -I${includedir} + diff --git a/clibcni.spec b/clibcni.spec index e6fdab939a0d6a805dabad9be4003f78c3809cd5..79a1fa0c4cf1b5df418b685bc1afca07f3db06ae 100644 --- a/clibcni.spec +++ b/clibcni.spec @@ -1,5 +1,5 @@ %global _version 2.1.0 -%global _release 4 +%global _release 5 Name: clibcni Version: %{_version} Release: %{_release} @@ -9,6 +9,7 @@ License: Mulan PSL v2 URL: https://gitee.com/openeuler/clibcni Source0: https://gitee.com/openeuler/clibcni/repository/archive/v%{version}.tar.gz Patch0001: 0001-clibcni-port-to-newer-cmake.patch +Patch0002: 0002-use-GNUInstallDirs-for-libs.patch %define libisulaver_lower 2.1.1-0 @@ -64,6 +65,9 @@ install -m 0644 %{_vpath_srcdir}/src/version/version.h %{buildroot}/%{_includedi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Aug 22 2025 Funda Wang - 2.1.0-5 +- use GNUInstallDirs for libs + * Sun Mar 02 2025 Funda Wang - 2.1.0-4 - build with cmake 4.0