From cb09d4ed0195a448ecd849bbdd1e5515ae944984 Mon Sep 17 00:00:00 2001 From: tigro Date: Sat, 14 Dec 2024 21:20:34 +0300 Subject: [PATCH] import fmt-10.2.1-5.el10 --- .fmt.metadata | 1 + .gitignore | 18 +-------- fmt.spec => SPECS/fmt.spec | 63 ++++++++++++++++++++++++----- fmt-fix_implicit_ptr_conv.patch | 72 --------------------------------- sources | 1 - 5 files changed, 55 insertions(+), 100 deletions(-) create mode 100644 .fmt.metadata rename fmt.spec => SPECS/fmt.spec (75%) delete mode 100644 fmt-fix_implicit_ptr_conv.patch delete mode 100644 sources diff --git a/.fmt.metadata b/.fmt.metadata new file mode 100644 index 0000000..076d006 --- /dev/null +++ b/.fmt.metadata @@ -0,0 +1 @@ +d223964b782d2562d6722ffe67027204c6035453 SOURCES/10.2.1.tar.gz diff --git a/.gitignore b/.gitignore index cdfecb4..9662069 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1 @@ -/fmt-3.0.0.zip -/fmt-3.0.1.zip -/fmt-3.0.1.tar.gz -/fmt-3.0.2.tar.gz -/5.2.1.tar.gz -/5.3.0.tar.gz -/6.1.2.tar.gz -/6.2.0.tar.gz -/6.2.1.tar.gz -/7.0.1.tar.gz -/7.0.2.tar.gz -/7.0.3.tar.gz -/7.1.2.tar.gz -/7.1.3.tar.gz -/8.0.1.tar.gz -/8.1.0.tar.gz -/8.1.1.tar.gz +SOURCES/10.2.1.tar.gz diff --git a/fmt.spec b/SPECS/fmt.spec similarity index 75% rename from fmt.spec rename to SPECS/fmt.spec index 2cae4e1..0e6402c 100644 --- a/fmt.spec +++ b/SPECS/fmt.spec @@ -1,17 +1,12 @@ -%undefine __cmake_in_source_build - Name: fmt -Version: 8.1.1 +Version: 10.2.1 Release: 5%{?dist} -License: BSD +License: MIT Summary: Small, safe and fast formatting library for C++ URL: https://github.com/fmtlib/%{name} 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++ @@ -28,6 +23,8 @@ safe alternative to printf or as a fast alternative to IOStreams. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +# for usage with -DFMT_HEADER_ONLY +Provides: %{name}-static = %{?epoch:%{epoch}:}%{version}-%{release} # This package replaces the old name of cppformat Provides: cppformat-devel = %{?epoch:%{epoch}:}%{version}-%{release} @@ -54,9 +51,9 @@ This package contains the header file for using %{name}. %ctest %files -%license LICENSE.rst -%doc ChangeLog.rst README.rst -%{_libdir}/lib%{name}.so.8* +%license LICENSE +%doc ChangeLog.md README.md +%{_libdir}/lib%{name}.so.10* %files devel %{_includedir}/%{name} @@ -65,6 +62,52 @@ This package contains the header file for using %{name}. %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Dec 14 2024 Arkady L. Shane - 10.2.1-5 +- Rebuilt for MSVSphere 10 + +* Tue Oct 29 2024 Troy Dawson - 10.2.1-5 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 10.2.1-4 +- Bump release for June 2024 mass rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 10.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 10.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jan 17 2024 Kefu Chai - 10.2.1-1 +- Updated to version 10.2.1. + +* Wed Nov 15 2023 Kefu Chai - 10.1.1-1 +- Updated to version 10.1.1. + +* Thu Aug 03 2023 Yaakov Selkowitz - 10.0.0-4 +- Add Provides: fmt-static to fmt-devel + +* Wed Jul 19 2023 Fedora Release Engineering - 10.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jun 28 2023 Vitaly Zaitsev - 10.0.0-2 +- Added upstream patch with time_point fixes. + +* Wed May 10 2023 Vitaly Zaitsev - 10.0.0-1 +- Updated to version 10.0.0. + +* Thu Jan 19 2023 Fedora Release Engineering - 9.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sun Aug 28 2022 Vitaly Zaitsev - 9.1.0-1 +- Updated to version 9.1.0. + +* Thu Jul 21 2022 Fedora Release Engineering - 9.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 06 2022 Vitaly Zaitsev - 9.0.0-1 +- Updated to version 9.0.0. + * Wed Mar 02 2022 Vitaly Zaitsev - 8.1.1-5 - Removed obsolete macros. diff --git a/fmt-fix_implicit_ptr_conv.patch b/fmt-fix_implicit_ptr_conv.patch deleted file mode 100644 index 1d45d05..0000000 --- a/fmt-fix_implicit_ptr_conv.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 8f8a1a02d5c5cb967d240feee3ffac00d66f22a2 Mon Sep 17 00:00:00 2001 -From: Victor Zverovich -Date: Fri, 14 Jan 2022 13:08:14 -0800 -Subject: [PATCH] Fix handling of formattable types implicitly convertible to - pointers - ---- - include/fmt/core.h | 5 +++-- - test/core-test.cc | 21 ++++++++++++++++++++- - 2 files changed, 23 insertions(+), 3 deletions(-) - -diff --git a/include/fmt/core.h b/include/fmt/core.h -index f2d21e5c5a..12571ce0da 100644 ---- a/include/fmt/core.h -+++ b/include/fmt/core.h -@@ -1398,10 +1398,11 @@ template struct arg_mapper { - template < - typename T, - FMT_ENABLE_IF( -- std::is_member_pointer::value || -+ std::is_pointer::value || std::is_member_pointer::value || - std::is_function::type>::value || - (std::is_convertible::value && -- !std::is_convertible::value))> -+ !std::is_convertible::value && -+ !has_formatter::value))> - FMT_CONSTEXPR auto map(const T&) -> unformattable_pointer { - return {}; - } -diff --git a/test/core-test.cc b/test/core-test.cc -index b2f2097ea1..c9eea8ffd8 100644 ---- a/test/core-test.cc -+++ b/test/core-test.cc -@@ -737,6 +737,24 @@ struct convertible_to_pointer { - operator const int*() const { return nullptr; } - }; - -+struct convertible_to_pointer_formattable { -+ operator const int*() const { return nullptr; } -+}; -+ -+FMT_BEGIN_NAMESPACE -+template <> struct formatter { -+ auto parse(format_parse_context& ctx) -> decltype(ctx.begin()) { -+ return ctx.begin(); -+ } -+ -+ auto format(convertible_to_pointer_formattable, format_context& ctx) const -+ -> decltype(ctx.out()) { -+ auto test = string_view("test"); -+ return std::copy_n(test.data(), test.size(), ctx.out()); -+ } -+}; -+FMT_END_NAMESPACE -+ - enum class test_scoped_enum {}; - - TEST(core_test, is_formattable) { -@@ -770,11 +788,12 @@ TEST(core_test, is_formattable) { - #endif - - static_assert(!fmt::is_formattable::value, ""); -+ const auto f = convertible_to_pointer_formattable(); -+ EXPECT_EQ(fmt::format("{}", f), "test"); - - static_assert(!fmt::is_formattable::value, ""); - - struct s; -- - static_assert(!fmt::is_formattable::value, ""); - static_assert(!fmt::is_formattable::value, ""); - static_assert(!fmt::is_formattable::value, ""); diff --git a/sources b/sources deleted file mode 100644 index 8a5aa90..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (8.1.1.tar.gz) = 794a47d7cb352a2a9f2c050a60a46b002e4157e5ad23e15a5afc668e852b1e1847aeee3cda79e266c789ff79310d792060c94976ceef6352e322d60b94e23189