diff --git a/fmt.spec b/fmt.spec index 03958c3..2cae4e1 100644 --- a/fmt.spec +++ b/fmt.spec @@ -2,7 +2,7 @@ Name: fmt Version: 8.1.1 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Summary: Small, safe and fast formatting library for C++ @@ -12,14 +12,10 @@ Source0: %{url}/archive/%{version}.tar.gz # fix for https://github.com/fmtlib/fmt/issues/2717 Patch100: %{name}-fix_implicit_ptr_conv.patch +BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: ninja-build -%if 0%{?rhel} && 0%{?rhel} <= 7 -BuildRequires: cmake3 -%else -BuildRequires: cmake -%endif # This package replaces the old name of cppformat Provides: cppformat = %{?epoch:%{epoch}:}%{version}-%{release} @@ -44,16 +40,11 @@ This package contains the header file for using %{name}. %autosetup -p1 %build -%if 0%{?rhel} && 0%{?rhel} <= 7 -%cmake3 \ -%else -%cmake \ -%endif - -G Ninja \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DFMT_CMAKE_DIR=%{_libdir}/cmake/%{name} \ - -DFMT_LIB_DIR=%{_libdir} +%cmake -G Ninja \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON \ + -DFMT_CMAKE_DIR:STRING=%{_libdir}/cmake/%{name} \ + -DFMT_LIB_DIR:STRING=%{_libdir} %cmake_build %install @@ -74,7 +65,10 @@ This package contains the header file for using %{name}. %{_libdir}/pkgconfig/%{name}.pc %changelog -* Tue Mar 1 2022 Michel Alexandre Salim - 8.1.1-4 +* Wed Mar 02 2022 Vitaly Zaitsev - 8.1.1-5 +- Removed obsolete macros. + +* Tue Mar 01 2022 Michel Alexandre Salim - 8.1.1-4 - Backport fix handling of formattable types implicitly convertible to pointers (fixes: rhbz#2059736) * Thu Jan 27 2022 Zbigniew Jędrzejewski-Szmek - 8.1.1-3