diff --git a/clibcni.spec b/clibcni.spec index e32f0697cac83a0a21f04ffd42ed7c9fffae0022..e431502023536bddb2eb1390670148834c110a46 100644 --- a/clibcni.spec +++ b/clibcni.spec @@ -1,5 +1,5 @@ %global _version 2.1.0 -%global _release 2 +%global _release 3 Name: clibcni Version: %{_version} Release: %{_release} @@ -8,7 +8,6 @@ Group: System Environment/Libraries License: Mulan PSL v2 URL: https://gitee.com/openeuler/clibcni Source0: https://gitee.com/openeuler/clibcni/repository/archive/v%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version} %define libisulaver_lower 2.1.1-0 @@ -18,10 +17,6 @@ BuildRequires: libisula-devel > %{libisulaver_lower} yajl-devel gtest-devel gmoc Requires: libisula > %{libisulaver_lower} -%ifarch x86_64 aarch64 riscv64 loongarch64 ppc64le -Provides: lib%{name}.so()(64bit) -%endif - %description CNI (Container Network Interface), a Cloud Native Computing Foundation project, consists of a specification and libraries for writing plugins to configure @@ -43,50 +38,34 @@ the %{name}-libs package contains libraries for running %{name} applications. %autosetup -n clibcni-v%{_version} -Sgit -p1 %build -mkdir -p build -cd build -%cmake -DDEBUG=ON -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} ../ -%make_build +%cmake -DDEBUG=ON -DCMAKE_SKIP_RPATH=TRUE +%cmake_build %install -rm -rf %{buildroot} -cd build +%cmake_install install -d $RPM_BUILD_ROOT/%{_libdir} -install -m 0644 ./src/libclibcni.so %{buildroot}/%{_libdir}/libclibcni.so -chmod +x %{buildroot}/%{_libdir}/libclibcni.so +install -m 0755 %{__cmake_builddir}/src/libclibcni.so %{buildroot}/%{_libdir}/libclibcni.so install -d $RPM_BUILD_ROOT/%{_libdir}/pkgconfig -install -m 0644 ./conf/clibcni.pc %{buildroot}/%{_libdir}/pkgconfig/clibcni.pc +install -m 0644 %{__cmake_builddir}/conf/clibcni.pc %{buildroot}/%{_libdir}/pkgconfig/clibcni.pc install -d $RPM_BUILD_ROOT/%{_includedir}/clibcni -install -m 0644 ../src/api.h %{buildroot}/%{_includedir}/clibcni/api.h -install -m 0644 ../src/types/types.h %{buildroot}/%{_includedir}/clibcni/types.h -install -m 0644 ../src/version/version.h %{buildroot}/%{_includedir}/clibcni/version.h - - -find %{buildroot} -type f -name '*.la' -exec rm -f {} ';' -find %{buildroot} -name '*.a' -exec rm -f {} ';' -find %{buildroot} -name '*.cmake' -exec rm -f {} ';' - -%clean -rm -rf %{buildroot} +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 -%pre - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) -%{_libdir}/lib%{name}.so* +%{_libdir}/lib%{name}.so %files devel -%defattr(-,root,root,-) %{_includedir}/%{name}/*.h %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Nov 18 2024 Funda Wang - 2.1.0-3 +- adopt to new cmake macro + * Tue Nov 28 2023 peng.zou - 2.1.0-2 - Type: feature - ID: NA