Removed obsolete macros.

This commit is contained in:
Vitaly Zaitsev 2022-03-02 12:19:04 +01:00
parent 202d67aebb
commit f65fa91e51
No known key found for this signature in database
GPG Key ID: BF99FC6DD45AB90A

View File

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