From 10e3678c0afeff31a63a2cd422520e6114029b3044e1b184688f4fb62c0966d1 Mon Sep 17 00:00:00 2001 From: Bernd Ritter Date: Mon, 24 Oct 2022 21:55:53 +0000 Subject: [PATCH] Accepting request 1030963 from home:jengelh:branches:devel:libraries:c_c++ fix build failure OBS-URL: https://build.opensuse.org/request/show/1030963 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/spdlog?expand=0&rev=71 --- baselibs.conf | 4 +--- spdlog.spec | 31 ++++++++++++++++--------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 5fb2353..ebfa4e7 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1 @@ -libspdlog1 - +/usr/lib(64)?/libspdlog1/.* - requires -libspdlog1- +libspdlog1_10 diff --git a/spdlog.spec b/spdlog.spec index bef0737..48ca363 100644 --- a/spdlog.spec +++ b/spdlog.spec @@ -16,8 +16,9 @@ # -%define _sover 1_10 Name: spdlog +%define lname libspdlog1_10 +%define sover 1.10 Version: 1.10.0 Release: 0 Summary: C++ logging library @@ -26,7 +27,7 @@ URL: https://github.com/gabime/spdlog Source0: https://github.com/gabime/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source99: baselibs.conf # PATCH-FIX-UPSTREAM fix for bug boo#1199306 -Patch0: https://github.com/gabime/%{name}/commit/e36b69a0ecbdfb51cc28087b11256fb88c360ba4.patch +Patch0: https://github.com/gabime/%{name}/commit/e36b69a0ecbdfb51cc28087b11256fb88c360ba4.patch BuildRequires: cmake >= 3.10 %if 0%{?suse_version} > 1500 BuildRequires: gcc-c++ >= 8 @@ -44,8 +45,8 @@ This is a packaged version of the gabime/spdlog header-only C++ logging library available at Github. %package devel -Summary: Development files for %{name}%{_sover} -Requires: lib%{name}%{_sover} = %{version} +Summary: Header files for spdlog +Requires: %{lname} = %{version} Requires: libstdc++-devel Requires: pkgconfig(fmt) @@ -53,10 +54,10 @@ Requires: pkgconfig(fmt) The %{name}-devel package contains C++ header files for developing applications that use %{name}. -%package -n lib%{name}%{_sover} +%package -n %{lname} Summary: C++ logging library -%description -n lib%{name}%{_sover} +%description -n %{lname} This is a packaged version of the gabime/spdlog C++ logging library available at Github. @@ -82,22 +83,22 @@ test -x "$(type -p g++-8)" && export CXX=g++-8 %ninja_install -C build %check -export LD_LIBRARY_PATH="%{_builddir}/%{name}%{_sover}-%{version}/build" +export LD_LIBRARY_PATH="%{_builddir}/%{lname}-%{version}/build" %ctest -%post -n lib%{name}%{_sover} -p /sbin/ldconfig +%post -n %{lname} -p /sbin/ldconfig -%postun -n lib%{name}%{_sover} -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig %files devel %license LICENSE %doc README.md -%{_includedir}/%{name}%{_sover} -%{_libdir}/lib%{name}%{_sover}.so -%{_libdir}/cmake/%{name}%{_sover} -%{_libdir}/pkgconfig/%{name}%{_sover}.pc +%{_includedir}/spdlog/ +%{_libdir}/libspdlog.so +%{_libdir}/cmake/spdlog/ +%{_libdir}/pkgconfig/spdlog.pc -%files -n lib%{name}%{_sover} -%{_libdir}/lib%{name}%{_sover}.so.* +%files -n %{lname} +%{_libdir}/libspdlog.so.* %changelog