From 77a3c6be5ba6aafc9f49bf634674474f3ebd004e Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Thu, 31 Aug 2023 14:15:17 +0200 Subject: [PATCH] use modern autosetup and plain cmake dependency and macros --- utf8cpp.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/utf8cpp.spec b/utf8cpp.spec index e8d2d93..1b69388 100644 --- a/utf8cpp.spec +++ b/utf8cpp.spec @@ -14,7 +14,7 @@ Source0: https://github.com/nemtrif/utfcpp/archive/v%{version}/utfcpp-%{versi Source1: https://github.com/nemtrif/ftest/archive/%{ftest_commit}/ftest-%{ftest_shortcommit}.tar.gz # put cmake import file in arch-agnostic directory Patch1: %{name}-noarch.patch -BuildRequires: cmake3 +BuildRequires: cmake BuildRequires: gcc-c++ %description @@ -46,19 +46,18 @@ This project currently only contains header files, which can be found in the %{name}-devel package. %prep -%setup -q -n utfcpp-%{version} -a1 +%autosetup -n utfcpp-%{version} -a1 -p1 rmdir extern/ftest && mv ftest-%{ftest_commit} extern/ftest -%patch1 -p1 -b .noarch %build -%cmake3 \ +%cmake \ -DUTF8_TESTS=ON \ -DUTF8_SAMPLES=ON \ %{nil} -%cmake3_build +%cmake_build %install -%cmake3_install +%cmake_install pushd %{buildroot}%{_includedir} ln -s utf8cpp/utf8.h ./ mkdir utf8 @@ -86,6 +85,7 @@ popd * Thu Aug 31 2023 Dominik Mierzejewski - 3.2.4-1 - update to 3.2.4 (resolves rhbz#2231660) - switch to SPDX expression in License tag +- use modern autosetup and plain cmake dependency and macros * Sat Jul 22 2023 Fedora Release Engineering - 3.2.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild