From 693c2df848faba2ccfe03b9e1253d4da5471a786 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Tue, 30 Sep 2025 21:59:54 +0800
Subject: [PATCH] use GNUInstallDirs for libs

---
 0002-use-GNUInstallDirs-for-libs.patch | 53 ++++++++++++++++++++++++++
 clibcni.spec                           | 18 +++------
 2 files changed, 59 insertions(+), 12 deletions(-)
 create mode 100644 0002-use-GNUInstallDirs-for-libs.patch

diff --git a/0002-use-GNUInstallDirs-for-libs.patch b/0002-use-GNUInstallDirs-for-libs.patch
new file mode 100644
index 0000000..50c8c90
--- /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 e6fdab9..69b8f2b 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
 
@@ -44,26 +45,19 @@ the %{name}-libs package contains libraries for running %{name} applications.
 
 %install
 %cmake_install
-install -d $RPM_BUILD_ROOT/%{_libdir}
-install -m 0755 %{__cmake_builddir}/src/libclibcni.so        %{buildroot}/%{_libdir}/libclibcni.so
-
-install -d $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
-install -m 0644 %{__cmake_builddir}/conf/clibcni.pc      %{buildroot}/%{_libdir}/pkgconfig/clibcni.pc
-
-install -d $RPM_BUILD_ROOT/%{_includedir}/clibcni
-install -m 0644 %{_vpath_srcdir}/src/api.h           %{buildroot}/%{_includedir}/clibcni/api.h
-install -m 0644 %{_vpath_srcdir}/src/types/types.h   %{buildroot}/%{_includedir}/clibcni/types.h
-install -m 0644 %{_vpath_srcdir}/src/version/version.h %{buildroot}/%{_includedir}/clibcni/version.h
-
 
 %files
 %{_libdir}/lib%{name}.so
 
 %files devel
+%dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*.h
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Fri Aug 22 2025 Funda Wang <fundawang@yeah.net> - 2.1.0-5
+- use GNUInstallDirs for libs
+
 * Sun Mar 02 2025 Funda Wang <fundawang@yeah.net> - 2.1.0-4
 - build with cmake 4.0
 
-- 
Gitee