From adfccdccc6d4120110ac5f18f08ccea6662dea00 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Thu, 31 Aug 2023 14:10:40 +0200 Subject: [PATCH] update to 3.2.4 (resolves rhbz#2231660) switch to wildcards in .gitignore --- .gitignore | 12 ++---------- sources | 2 +- utf8cpp-noarch.patch | 8 ++++---- utf8cpp.spec | 7 +++++-- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 7caea4f..35ed041 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,3 @@ /utf8_v2_3_4.zip -/utfcpp-2.3.6.tar.gz -/utfcpp-3.1.tar.gz -/utfcpp-3.1.2.tar.gz -/ftest-9c7e60c.tar.gz -/utfcpp-3.2.tar.gz -/utfcpp-3.2.1.tar.gz -/ftest-bf75576.tar.gz -/utfcpp-3.2.2.tar.gz -/ftest-c4ad4af.tar.gz -/utfcpp-3.2.3.tar.gz +/ftest-*.tar.gz +/utfcpp-*.tar.gz diff --git a/sources b/sources index 900b513..824d05a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ftest-c4ad4af.tar.gz) = ac328665d2f22fe72f7252d4f7ae84c74ea551407ba618151ef1c281159df8744f1e6efb9b21d4e1df774528f0b979d45ee5d82d3e8ab146aa9f2ad91b0b6d37 -SHA512 (utfcpp-3.2.3.tar.gz) = 760977df613abfb34fb7864cbbe90e8f2cf1f42b8502427a5e9c2a756ce87655120b7490ebdaa6c926a2cb56caef9ead0e0e10fb7cb732cf99a5b43c0cca411b +SHA512 (utfcpp-3.2.4.tar.gz) = 5135b13a03ee814cb35e04459b2d91b8fbe91cd518a604c41062b4ad42b739fce1acf946b01904309e0edffb874f5e81f69d28afdc8b6f759ef2d675ca0c0db0 diff --git a/utf8cpp-noarch.patch b/utf8cpp-noarch.patch index 9293874..a6d24bf 100644 --- a/utf8cpp-noarch.patch +++ b/utf8cpp-noarch.patch @@ -1,6 +1,6 @@ -diff -up utfcpp-3.2.3/CMakeLists.txt.noarch utfcpp-3.2.3/CMakeLists.txt ---- utfcpp-3.2.3/CMakeLists.txt.noarch 2023-01-03 14:54:55.003285601 +0100 -+++ utfcpp-3.2.3/CMakeLists.txt 2023-01-03 14:55:34.844123997 +0100 +diff -up utfcpp-3.2.4/CMakeLists.txt.noarch utfcpp-3.2.4/CMakeLists.txt +--- utfcpp-3.2.4/CMakeLists.txt.noarch 2023-08-31 14:09:08.102223665 +0200 ++++ utfcpp-3.2.4/CMakeLists.txt 2023-08-31 14:09:32.632366839 +0200 @@ -24,7 +24,7 @@ if(UTF8_INSTALL) set(DEF_INSTALL_CMAKE_DIR CMake) else() @@ -9,4 +9,4 @@ diff -up utfcpp-3.2.3/CMakeLists.txt.noarch utfcpp-3.2.3/CMakeLists.txt + set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_DATADIR}/cmake/utf8cpp) endif() - write_basic_package_version_file( + if(${CMAKE_VERSION} VERSION_GREATER "3.14") diff --git a/utf8cpp.spec b/utf8cpp.spec index 78f8428..477d7a4 100644 --- a/utf8cpp.spec +++ b/utf8cpp.spec @@ -5,8 +5,8 @@ %global ftest_shortcommit %(c=%{ftest_commit}; echo ${c:0:7}) Name: utf8cpp -Version: 3.2.3 -Release: 3%{?dist} +Version: 3.2.4 +Release: 1%{?dist} Summary: A simple, portable and lightweight library for handling UTF-8 encoded strings License: Boost URL: https://github.com/nemtrif/utfcpp @@ -83,6 +83,9 @@ popd %{_datadir}/cmake/utf8cpp %changelog +* Thu Aug 31 2023 Dominik Mierzejewski - 3.2.4-1 +- update to 3.2.4 (resolves rhbz#2231660) + * Sat Jul 22 2023 Fedora Release Engineering - 3.2.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild