From 8257e1073c71591cd829e706cbdc8713d8cfae18 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Fri, 2 Feb 2024 14:22:15 +0100 Subject: [PATCH] Revert "Drop utf8cpp for now" This reverts commit 119cdb5e5ef26322f31c8a43cde845825f5cf283. --- libebml.spec | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/libebml.spec b/libebml.spec index ab2a917..4f9b55a 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,3 @@ -%if 0%{?el9} -%global _without_utf8cpp 1 -%endif - Summary: Extensible Binary Meta Language library Name: libebml Version: 1.4.2 @@ -14,7 +10,7 @@ Patch0: %{name}-use-system-utf8cpp.patch Patch1: %{name}-gcc11.patch BuildRequires: cmake3 BuildRequires: gcc-c++ -%{!?_without_utf8cpp:BuildRequires: utf8cpp-devel} +BuildRequires: utf8cpp-devel %description Extensible Binary Meta Language access library A library for reading @@ -39,11 +35,9 @@ will use the Extensible Binary Meta Language library. %prep %setup -q -%{!?_without_utf8cpp: %patch0 -p1 -b .utf8cpp +%patch1 -p1 -b .gcc11 rm -r src/lib/utf8-cpp -} -%patch1 -p1 -b .gcc11dd %build