From 6ba91435b6ca755c32b0e6ebf32d230d4fb554bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 22:27:30 +0000 Subject: [PATCH 01/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- opencc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opencc.spec b/opencc.spec index 1dfc92d..96064d1 100644 --- a/opencc.spec +++ b/opencc.spec @@ -1,6 +1,6 @@ Name: opencc Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Libraries for Simplified-Traditional Chinese Conversion License: ASL 2.0 URL: https://github.com/BYVoid/OpenCC @@ -77,6 +77,9 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/*.pc %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Aug 4 2020 Peng Wu - 1.1.1-1 - Update to 1.1.1 From 708d2c5339a90af15b1c6db33d1e6d55d797b056 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 17:10:43 +0000 Subject: [PATCH 02/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- opencc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opencc.spec b/opencc.spec index 96064d1..8d6144d 100644 --- a/opencc.spec +++ b/opencc.spec @@ -1,6 +1,6 @@ Name: opencc Version: 1.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Libraries for Simplified-Traditional Chinese Conversion License: ASL 2.0 URL: https://github.com/BYVoid/OpenCC @@ -77,6 +77,9 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 2a67bc29832f55d3c28c9d0a34f74d4dd3b8b1f3 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Mon, 2 Aug 2021 11:29:41 +0800 Subject: [PATCH 03/19] Update to 1.1.2 --- .gitignore | 1 + opencc.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 828f451..79825db 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /OpenCC-ver.1.0.3.tar.gz /OpenCC-ver.1.0.5.tar.gz /OpenCC-ver.1.1.1.tar.gz +/OpenCC-ver.1.1.2.tar.gz diff --git a/opencc.spec b/opencc.spec index 8d6144d..9068561 100644 --- a/opencc.spec +++ b/opencc.spec @@ -1,6 +1,6 @@ Name: opencc -Version: 1.1.1 -Release: 3%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: Libraries for Simplified-Traditional Chinese Conversion License: ASL 2.0 URL: https://github.com/BYVoid/OpenCC @@ -77,6 +77,9 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/*.pc %changelog +* Mon Aug 2 2021 Peng Wu - 1.1.2-1 +- Update to 1.1.2 + * Thu Jul 22 2021 Fedora Release Engineering - 1.1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index ff9d8f1..814987e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OpenCC-ver.1.1.1.tar.gz) = 48ccf61f63cf0a1c0fc484a52ae1d406a28949a52be7d7d1595e6aaf87f40ac47ea4697308441a9381f0cd6f404ee5a28b85a2fa2f288c4b3933be36f4a41363 +SHA512 (OpenCC-ver.1.1.2.tar.gz) = 56c84bc472b39eb0b23bac6df5aada2c2ed5fd2fbe653c1ae89d392ec0b74741a15de93c748883ec3c0779396e790a1197f6e3b267b524f111459d45daeb5d4b From b088feca44b92ce0f185354f0fc47660366723e9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 22:18:42 +0000 Subject: [PATCH 04/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- opencc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opencc.spec b/opencc.spec index 9068561..fb24e96 100644 --- a/opencc.spec +++ b/opencc.spec @@ -1,6 +1,6 @@ Name: opencc Version: 1.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Libraries for Simplified-Traditional Chinese Conversion License: ASL 2.0 URL: https://github.com/BYVoid/OpenCC @@ -77,6 +77,9 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Aug 2 2021 Peng Wu - 1.1.2-1 - Update to 1.1.2 From 2026c59a47eebbe3c9935a294f7ca0a9de48e3a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 02:00:53 +0000 Subject: [PATCH 05/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- opencc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opencc.spec b/opencc.spec index fb24e96..4e2f175 100644 --- a/opencc.spec +++ b/opencc.spec @@ -1,6 +1,6 @@ Name: opencc Version: 1.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Libraries for Simplified-Traditional Chinese Conversion License: ASL 2.0 URL: https://github.com/BYVoid/OpenCC @@ -77,6 +77,9 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/*.pc %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 1.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 1.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 6b79b75652b91253230bff15965b4d193b372d1f Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Fri, 21 Oct 2022 11:54:48 +0800 Subject: [PATCH 06/19] Update to 1.1.4 --- .gitignore | 1 + opencc.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 79825db..bc14bb8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /OpenCC-ver.1.0.5.tar.gz /OpenCC-ver.1.1.1.tar.gz /OpenCC-ver.1.1.2.tar.gz +/OpenCC-ver.1.1.4.tar.gz diff --git a/opencc.spec b/opencc.spec index 4e2f175..caad4b1 100644 --- a/opencc.spec +++ b/opencc.spec @@ -1,6 +1,6 @@ Name: opencc -Version: 1.1.2 -Release: 3%{?dist} +Version: 1.1.4 +Release: 1%{?dist} Summary: Libraries for Simplified-Traditional Chinese Conversion License: ASL 2.0 URL: https://github.com/BYVoid/OpenCC @@ -77,6 +77,9 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/*.pc %changelog +* Fri Oct 21 2022 Peng Wu - 1.1.4-1 +- Update to 1.1.4 + * Fri Jul 22 2022 Fedora Release Engineering - 1.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 814987e..e1ed561 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OpenCC-ver.1.1.2.tar.gz) = 56c84bc472b39eb0b23bac6df5aada2c2ed5fd2fbe653c1ae89d392ec0b74741a15de93c748883ec3c0779396e790a1197f6e3b267b524f111459d45daeb5d4b +SHA512 (OpenCC-ver.1.1.4.tar.gz) = ab8e7e6a0cc71106cf09eb32899fa8620b946a406f042d75a2444096e0b383cb1993d6c2d12cd7862e71854da4cd5893442bce51df84c32ed09fdfb4a2846f46 From 193303670d1142aba1a0f6525d918c060df969a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 22:45:35 +0000 Subject: [PATCH 07/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- opencc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opencc.spec b/opencc.spec index caad4b1..5c9c5c2 100644 --- a/opencc.spec +++ b/opencc.spec @@ -1,6 +1,6 @@ Name: opencc Version: 1.1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Libraries for Simplified-Traditional Chinese Conversion License: ASL 2.0 URL: https://github.com/BYVoid/OpenCC @@ -77,6 +77,9 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Oct 21 2022 Peng Wu - 1.1.4-1 - Update to 1.1.4 From 48e17907366fdcb428f8eede962cd329a7f4e5f0 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 18 May 2023 14:43:25 +0800 Subject: [PATCH 08/19] Migrate to SPDX license --- opencc.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/opencc.spec b/opencc.spec index 5c9c5c2..b396283 100644 --- a/opencc.spec +++ b/opencc.spec @@ -1,8 +1,8 @@ Name: opencc Version: 1.1.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Libraries for Simplified-Traditional Chinese Conversion -License: ASL 2.0 +License: Apache-2.0 URL: https://github.com/BYVoid/OpenCC Source0: https://github.com/BYVoid/OpenCC/archive/ver.%{version}.tar.gz#/OpenCC-ver.%{version}.tar.gz @@ -57,8 +57,6 @@ developing applications that use %{name}. #%find_lang %{name} -%ldconfig_scriptlets - %files %doc AUTHORS LICENSE README.md %{_libdir}/lib*.so.* @@ -77,6 +75,9 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/*.pc %changelog +* Thu May 18 2023 Peng Wu - 1.1.4-3 +- Migrate to SPDX license + * Thu Jan 19 2023 Fedora Release Engineering - 1.1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 9b28485afbf867299f316ee38716ffd497e45435 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 17:59:16 +0000 Subject: [PATCH 09/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- opencc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opencc.spec b/opencc.spec index b396283..88deec6 100644 --- a/opencc.spec +++ b/opencc.spec @@ -1,6 +1,6 @@ Name: opencc Version: 1.1.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Libraries for Simplified-Traditional Chinese Conversion License: Apache-2.0 URL: https://github.com/BYVoid/OpenCC @@ -75,6 +75,9 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1.1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu May 18 2023 Peng Wu - 1.1.4-3 - Migrate to SPDX license From da061792f7b086c399d3934c0c33ba44fee1a4d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 11:07:02 +0000 Subject: [PATCH 10/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- opencc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opencc.spec b/opencc.spec index 88deec6..ded7084 100644 --- a/opencc.spec +++ b/opencc.spec @@ -1,6 +1,6 @@ Name: opencc Version: 1.1.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Libraries for Simplified-Traditional Chinese Conversion License: Apache-2.0 URL: https://github.com/BYVoid/OpenCC @@ -75,6 +75,9 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/*.pc %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.1.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 1.1.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 094ceb167fe8733ca42556f264b6a7614cbeac8a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 11:09:32 +0000 Subject: [PATCH 11/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- opencc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opencc.spec b/opencc.spec index ded7084..a99f7ef 100644 --- a/opencc.spec +++ b/opencc.spec @@ -1,6 +1,6 @@ Name: opencc Version: 1.1.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Libraries for Simplified-Traditional Chinese Conversion License: Apache-2.0 URL: https://github.com/BYVoid/OpenCC @@ -75,6 +75,9 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.1.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.1.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 54c3deae346e824c3a334c795c5e04c89580ed8b Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Fri, 2 Feb 2024 14:34:25 +0800 Subject: [PATCH 12/19] Update to 1.1.7 --- .gitignore | 1 + opencc-fixes-cmake.patch | 26 ------------------------- opencc-fixes-std-initializer-list.patch | 13 +++++++++++++ opencc.spec | 15 +++++++++++--- sources | 2 +- 5 files changed, 27 insertions(+), 30 deletions(-) delete mode 100644 opencc-fixes-cmake.patch create mode 100644 opencc-fixes-std-initializer-list.patch diff --git a/.gitignore b/.gitignore index bc14bb8..16d49c1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /OpenCC-ver.1.1.1.tar.gz /OpenCC-ver.1.1.2.tar.gz /OpenCC-ver.1.1.4.tar.gz +/OpenCC-ver.1.1.7.tar.gz diff --git a/opencc-fixes-cmake.patch b/opencc-fixes-cmake.patch deleted file mode 100644 index c70ce95..0000000 --- a/opencc-fixes-cmake.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: OpenCC-ver.1.0.5/CMakeLists.txt -=================================================================== ---- OpenCC-ver.1.0.5.orig/CMakeLists.txt -+++ OpenCC-ver.1.0.5/CMakeLists.txt -@@ -68,7 +68,7 @@ set (DIR_PREFIX ${CMAKE_INSTALL_PREFIX}) - set (DIR_INCLUDE ${DIR_PREFIX}/include/) - set (DIR_SHARE ${DIR_PREFIX}/share/) - set (DIR_ETC ${DIR_PREFIX}/etc/) --set (DIR_LIBRARY ${DIR_PREFIX}/lib${LIB_SUFFIX}/) -+set (DIR_LIBRARY ${LIB_INSTALL_DIR}) - - if (DEFINED SHARE_INSTALL_PREFIX) - set (DIR_SHARE ${SHARE_INSTALL_PREFIX}) -Index: OpenCC-ver.1.0.5/data/CMakeLists.txt -=================================================================== ---- OpenCC-ver.1.0.5.orig/data/CMakeLists.txt -+++ OpenCC-ver.1.0.5/data/CMakeLists.txt -@@ -1,6 +1,6 @@ - set(OPENCC_DICT_BIN opencc_dict) --set(DICT_MERGE_BIN python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/merge.py) --set(DICT_REVERSE_BIN python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/reverse.py) -+set(DICT_MERGE_BIN python3 ${CMAKE_CURRENT_SOURCE_DIR}/scripts/merge.py) -+set(DICT_REVERSE_BIN python3 ${CMAKE_CURRENT_SOURCE_DIR}/scripts/reverse.py) - set(DICT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dictionary) - set(DICT_GENERATED_DIR ${CMAKE_CURRENT_BINARY_DIR}) - diff --git a/opencc-fixes-std-initializer-list.patch b/opencc-fixes-std-initializer-list.patch new file mode 100644 index 0000000..c495e30 --- /dev/null +++ b/opencc-fixes-std-initializer-list.patch @@ -0,0 +1,13 @@ +Index: OpenCC-ver.1.1.7/src/Segments.hpp +=================================================================== +--- OpenCC-ver.1.1.7.orig/src/Segments.hpp ++++ OpenCC-ver.1.1.7/src/Segments.hpp +@@ -32,7 +32,7 @@ public: + Segments() {} + + Segments(std::initializer_list initList) { +- for (const std::string& item : initList) { ++ for (const std::string item : initList) { + AddSegment(item); + } + } diff --git a/opencc.spec b/opencc.spec index a99f7ef..4d61208 100644 --- a/opencc.spec +++ b/opencc.spec @@ -1,16 +1,19 @@ Name: opencc -Version: 1.1.4 -Release: 6%{?dist} +Version: 1.1.7 +Release: 1%{?dist} Summary: Libraries for Simplified-Traditional Chinese Conversion License: Apache-2.0 URL: https://github.com/BYVoid/OpenCC Source0: https://github.com/BYVoid/OpenCC/archive/ver.%{version}.tar.gz#/OpenCC-ver.%{version}.tar.gz +Patch0: opencc-fixes-std-initializer-list.patch BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: cmake BuildRequires: doxygen BuildRequires: python3 +BuildRequires: marisa-devel +BuildRequires: rapidjson-devel %description OpenCC is a library for converting characters and phrases between @@ -44,9 +47,10 @@ developing applications that use %{name}. %prep %setup -q -n OpenCC-ver.%{version} +%patch -P0 -p1 -b .compile %build -%cmake -DENABLE_GETTEXT:BOOL=ON -DBUILD_DOCUMENTATION:BOOL=ON +%cmake -DENABLE_GETTEXT:BOOL=ON -DBUILD_DOCUMENTATION:BOOL=ON -DUSE_SYSTEM_MARISA:BOOL=ON -DUSE_SYSTEM_RAPIDJSON:BOOL=ON %cmake_build %install @@ -73,8 +77,13 @@ developing applications that use %{name}. %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc +%{_libdir}/cmake/opencc/OpenCC*.cmake %changelog +* Fri Feb 2 2024 Peng Wu - 1.1.7-1 +- Update to 1.1.7 +- Resolves: RHBZ#2261417 + * Thu Jan 25 2024 Fedora Release Engineering - 1.1.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index e1ed561..fa8183f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OpenCC-ver.1.1.4.tar.gz) = ab8e7e6a0cc71106cf09eb32899fa8620b946a406f042d75a2444096e0b383cb1993d6c2d12cd7862e71854da4cd5893442bce51df84c32ed09fdfb4a2846f46 +SHA512 (OpenCC-ver.1.1.7.tar.gz) = 26e4b12238f853b0fa91f9f0d9af7985bf04a0763185cc3b50b69ba99a2d80091b8c3160176d0d4cd348fbf1a680bfd80dc740dc60c938a256dc2dac8ef49f15 From 7bec307ba9fbeafca076fbdbfce2d38e04165b88 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 20:47:52 +0000 Subject: [PATCH 13/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- opencc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opencc.spec b/opencc.spec index 4d61208..847f851 100644 --- a/opencc.spec +++ b/opencc.spec @@ -1,6 +1,6 @@ Name: opencc Version: 1.1.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Libraries for Simplified-Traditional Chinese Conversion License: Apache-2.0 URL: https://github.com/BYVoid/OpenCC @@ -80,6 +80,9 @@ developing applications that use %{name}. %{_libdir}/cmake/opencc/OpenCC*.cmake %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Feb 2 2024 Peng Wu - 1.1.7-1 - Update to 1.1.7 - Resolves: RHBZ#2261417 From 4493c3a916d7702ca775f3abd4d52dffe3acda3a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 21:36:23 +0000 Subject: [PATCH 14/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- opencc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opencc.spec b/opencc.spec index 847f851..c29c05f 100644 --- a/opencc.spec +++ b/opencc.spec @@ -1,6 +1,6 @@ Name: opencc Version: 1.1.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Libraries for Simplified-Traditional Chinese Conversion License: Apache-2.0 URL: https://github.com/BYVoid/OpenCC @@ -80,6 +80,9 @@ developing applications that use %{name}. %{_libdir}/cmake/opencc/OpenCC*.cmake %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1.1.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 1.1.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From de188a5217ebb985e298d5a285591d449e581fa3 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 6 Feb 2025 15:59:50 +0800 Subject: [PATCH 15/19] Update to 1.1.9 --- .gitignore | 1 + opencc-fixes-compile.patch | 13 +++++++++++++ opencc-fixes-std-initializer-list.patch | 13 ------------- opencc.spec | 13 ++++++++----- sources | 2 +- 5 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 opencc-fixes-compile.patch delete mode 100644 opencc-fixes-std-initializer-list.patch diff --git a/.gitignore b/.gitignore index 16d49c1..692b3d2 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /OpenCC-ver.1.1.2.tar.gz /OpenCC-ver.1.1.4.tar.gz /OpenCC-ver.1.1.7.tar.gz +/OpenCC-ver.1.1.9.tar.gz diff --git a/opencc-fixes-compile.patch b/opencc-fixes-compile.patch new file mode 100644 index 0000000..fe7e4a8 --- /dev/null +++ b/opencc-fixes-compile.patch @@ -0,0 +1,13 @@ +Index: OpenCC-ver.1.1.9/src/SerializedValues.hpp +=================================================================== +--- OpenCC-ver.1.1.9.orig/src/SerializedValues.hpp ++++ OpenCC-ver.1.1.9/src/SerializedValues.hpp +@@ -18,6 +18,8 @@ + + #pragma once + ++#include ++ + #include "Common.hpp" + #include "SerializableDict.hpp" + diff --git a/opencc-fixes-std-initializer-list.patch b/opencc-fixes-std-initializer-list.patch deleted file mode 100644 index c495e30..0000000 --- a/opencc-fixes-std-initializer-list.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: OpenCC-ver.1.1.7/src/Segments.hpp -=================================================================== ---- OpenCC-ver.1.1.7.orig/src/Segments.hpp -+++ OpenCC-ver.1.1.7/src/Segments.hpp -@@ -32,7 +32,7 @@ public: - Segments() {} - - Segments(std::initializer_list initList) { -- for (const std::string& item : initList) { -+ for (const std::string item : initList) { - AddSegment(item); - } - } diff --git a/opencc.spec b/opencc.spec index c29c05f..063f184 100644 --- a/opencc.spec +++ b/opencc.spec @@ -1,11 +1,11 @@ Name: opencc -Version: 1.1.7 -Release: 3%{?dist} +Version: 1.1.9 +Release: 1%{?dist} Summary: Libraries for Simplified-Traditional Chinese Conversion License: Apache-2.0 URL: https://github.com/BYVoid/OpenCC Source0: https://github.com/BYVoid/OpenCC/archive/ver.%{version}.tar.gz#/OpenCC-ver.%{version}.tar.gz -Patch0: opencc-fixes-std-initializer-list.patch +Patch0: opencc-fixes-compile.patch BuildRequires: gcc-c++ BuildRequires: gettext @@ -46,8 +46,7 @@ developing applications that use %{name}. %prep -%setup -q -n OpenCC-ver.%{version} -%patch -P0 -p1 -b .compile +%autosetup -n OpenCC-ver.%{version} -p1 %build %cmake -DENABLE_GETTEXT:BOOL=ON -DBUILD_DOCUMENTATION:BOOL=ON -DUSE_SYSTEM_MARISA:BOOL=ON -DUSE_SYSTEM_RAPIDJSON:BOOL=ON @@ -80,6 +79,10 @@ developing applications that use %{name}. %{_libdir}/cmake/opencc/OpenCC*.cmake %changelog +* Thu Feb 6 2025 Peng Wu - 1.1.9-1 +- Update to 1.1.9 +- Resolves: RHBZ#2340967 + * Fri Jan 17 2025 Fedora Release Engineering - 1.1.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index fa8183f..cf36ac9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OpenCC-ver.1.1.7.tar.gz) = 26e4b12238f853b0fa91f9f0d9af7985bf04a0763185cc3b50b69ba99a2d80091b8c3160176d0d4cd348fbf1a680bfd80dc740dc60c938a256dc2dac8ef49f15 +SHA512 (OpenCC-ver.1.1.9.tar.gz) = 713cf00931d7616994eb455eef3bc893096b5cd6d42b346aa1130591752d9612891ea3ed035bd7bd4ec7df1c90425e86375f5b3337fac11663c656c79a8f33e9 From 098d75577fa81d61845b7abd0b29baf9d4721a86 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 17 Jul 2025 14:09:15 +0800 Subject: [PATCH 16/19] Update for marisa --- opencc-fixes-cmake.patch | 22 ++++++++++++++++++++ opencc-fixes-crash.patch | 44 ++++++++++++++++++++++++++++++++++++++++ opencc.spec | 7 ++++++- 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 opencc-fixes-cmake.patch create mode 100644 opencc-fixes-crash.patch diff --git a/opencc-fixes-cmake.patch b/opencc-fixes-cmake.patch new file mode 100644 index 0000000..237ac13 --- /dev/null +++ b/opencc-fixes-cmake.patch @@ -0,0 +1,22 @@ +Index: OpenCC-ver.1.1.9/CMakeLists.txt +=================================================================== +--- OpenCC-ver.1.1.9.orig/CMakeLists.txt ++++ OpenCC-ver.1.1.9/CMakeLists.txt +@@ -154,7 +154,7 @@ add_definitions( + + if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") + add_definitions( +- -std=c++14 ++ -std=c++17 + -Wall + ) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread") +@@ -163,7 +163,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES " + endif () + elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + add_definitions( +- -std=c++14 ++ -std=c++17 + -Wall + ) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread") diff --git a/opencc-fixes-crash.patch b/opencc-fixes-crash.patch new file mode 100644 index 0000000..ab0cd9f --- /dev/null +++ b/opencc-fixes-crash.patch @@ -0,0 +1,44 @@ +commit cfe3ced00bbf764f68f10222b9d2a6367c2c3f82 +Author: Peng Wu +Date: Tue Mar 25 13:43:05 2025 +0800 + + Fix crash when read the config file + +diff --git a/src/Config.cpp b/src/Config.cpp +index a8392b1..5c768c0 100644 +--- a/src/Config.cpp ++++ b/src/Config.cpp +@@ -16,6 +16,7 @@ + * limitations under the License. + */ + ++#include + #include + #include + #include +@@ -216,6 +217,16 @@ std::string GetParentDirectory(const std::string& path) { + return path.substr(0, pos + 1); + } + ++bool isRegularFile(const std::string& path) { ++ struct stat info; ++ ++ if (stat(path.c_str(), &info) != 0) ++ return false; ++ ++ // Check if it's a regular file ++ return (info.st_mode & S_IFMT) == S_IFREG; ++} ++ + } // namespace + + Config::Config() : internal(new ConfigInternal()) {} +@@ -241,6 +252,8 @@ ConverterPtr Config::NewFromFile(const std::string& fileName, + impl->paths.push_back(PACKAGE_DATA_DIRECTORY); + } + std::string prefixedFileName = impl->FindConfigFile(fileName); ++ if (!isRegularFile(prefixedFileName)) ++ throw FileNotFound(prefixedFileName); + std::ifstream ifs(UTF8Util::GetPlatformString(prefixedFileName)); + std::string content(std::istreambuf_iterator(ifs), + (std::istreambuf_iterator())); diff --git a/opencc.spec b/opencc.spec index 063f184..b13cfd7 100644 --- a/opencc.spec +++ b/opencc.spec @@ -1,11 +1,13 @@ Name: opencc Version: 1.1.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Libraries for Simplified-Traditional Chinese Conversion License: Apache-2.0 URL: https://github.com/BYVoid/OpenCC Source0: https://github.com/BYVoid/OpenCC/archive/ver.%{version}.tar.gz#/OpenCC-ver.%{version}.tar.gz Patch0: opencc-fixes-compile.patch +Patch1: opencc-fixes-crash.patch +Patch2: opencc-fixes-cmake.patch BuildRequires: gcc-c++ BuildRequires: gettext @@ -79,6 +81,9 @@ developing applications that use %{name}. %{_libdir}/cmake/opencc/OpenCC*.cmake %changelog +* Thu Jul 17 2025 Peng Wu - 1.1.9-2 +- Update for marisa 0.3.0 + * Thu Feb 6 2025 Peng Wu - 1.1.9-1 - Update to 1.1.9 - Resolves: RHBZ#2340967 From 5199323820ce975a6e0ce909e40b99dbe571ec61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:33:34 +0000 Subject: [PATCH 17/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- opencc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opencc.spec b/opencc.spec index b13cfd7..406701d 100644 --- a/opencc.spec +++ b/opencc.spec @@ -1,6 +1,6 @@ Name: opencc Version: 1.1.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Libraries for Simplified-Traditional Chinese Conversion License: Apache-2.0 URL: https://github.com/BYVoid/OpenCC @@ -81,6 +81,9 @@ developing applications that use %{name}. %{_libdir}/cmake/opencc/OpenCC*.cmake %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.1.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jul 17 2025 Peng Wu - 1.1.9-2 - Update for marisa 0.3.0 From ef6d2d6f3b43550d9f4c99b076a6a8afc2979e3c Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Tue, 12 Aug 2025 14:38:37 +0800 Subject: [PATCH 18/19] Update for https://fedoraproject.org/wiki/Changes/CMake_drop_install_vars --- opencc-fixes-cmake-vars.patch | 30 ++++++++++++++++++++++++++++++ opencc.spec | 7 ++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 opencc-fixes-cmake-vars.patch diff --git a/opencc-fixes-cmake-vars.patch b/opencc-fixes-cmake-vars.patch new file mode 100644 index 0000000..296a784 --- /dev/null +++ b/opencc-fixes-cmake-vars.patch @@ -0,0 +1,30 @@ +commit 01d0b4c88711daf697223be1aee78940f82b983e +Author: Peng Wu +Date: Mon Aug 11 16:22:12 2025 +0800 + + Update for https://fedoraproject.org/wiki/Changes/CMake_drop_install_vars + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b79e5b5..d5974f1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,6 +21,7 @@ cmake_minimum_required(VERSION 3.5) + set (PACKAGE_NAME opencc) + project (${PACKAGE_NAME} CXX) + include (CTest) ++include(GNUInstallDirs) + + ######## Options + option(BUILD_DOCUMENTATION "Use Doxygen to create the HTML based API documentation" OFF) +@@ -78,6 +79,11 @@ endif() + + ######## Directory + ++set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "") ++if(CMAKE_INSTALL_LIBDIR MATCHES "lib64$") ++ set(LIB_SUFFIX 64) ++endif() ++ + set (DIR_PREFIX ${CMAKE_INSTALL_PREFIX}) + set (DIR_INCLUDE ${DIR_PREFIX}/include) + set (DIR_SHARE ${DIR_PREFIX}/share) diff --git a/opencc.spec b/opencc.spec index 406701d..fb20e01 100644 --- a/opencc.spec +++ b/opencc.spec @@ -1,6 +1,6 @@ Name: opencc Version: 1.1.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Libraries for Simplified-Traditional Chinese Conversion License: Apache-2.0 URL: https://github.com/BYVoid/OpenCC @@ -8,6 +8,7 @@ Source0: https://github.com/BYVoid/OpenCC/archive/ver.%{version}.tar.gz#/Open Patch0: opencc-fixes-compile.patch Patch1: opencc-fixes-crash.patch Patch2: opencc-fixes-cmake.patch +Patch3: opencc-fixes-cmake-vars.patch BuildRequires: gcc-c++ BuildRequires: gettext @@ -81,6 +82,10 @@ developing applications that use %{name}. %{_libdir}/cmake/opencc/OpenCC*.cmake %changelog +* Tue Aug 12 2025 Peng Wu - 1.1.9-4 +- Update for https://fedoraproject.org/wiki/Changes/CMake_drop_install_vars +- Resolves: RHBZ#2381327 + * Thu Jul 24 2025 Fedora Release Engineering - 1.1.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From d2589d4ca33e44d2779fedbf3e85ff31d58057e9 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 21 Aug 2025 14:49:03 +0800 Subject: [PATCH 19/19] Update CI tests --- .fmf/version | 1 + opencc.spec | 6 ++- plans/basic.fmf | 5 ++ tests/main.fmf | 5 ++ .../opencc-testing-role/defaults/main.yml | 2 - tests/roles/opencc-testing-role/meta/main.yml | 4 -- .../roles/opencc-testing-role/tasks/main.yml | 47 ------------------- tests/runtest.sh | 25 ++++++++++ tests/tests.yml | 10 ---- 9 files changed, 41 insertions(+), 64 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/basic.fmf create mode 100644 tests/main.fmf delete mode 100644 tests/roles/opencc-testing-role/defaults/main.yml delete mode 100644 tests/roles/opencc-testing-role/meta/main.yml delete mode 100644 tests/roles/opencc-testing-role/tasks/main.yml create mode 100755 tests/runtest.sh delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/opencc.spec b/opencc.spec index fb20e01..5b031c6 100644 --- a/opencc.spec +++ b/opencc.spec @@ -1,6 +1,6 @@ Name: opencc Version: 1.1.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Libraries for Simplified-Traditional Chinese Conversion License: Apache-2.0 URL: https://github.com/BYVoid/OpenCC @@ -82,6 +82,10 @@ developing applications that use %{name}. %{_libdir}/cmake/opencc/OpenCC*.cmake %changelog +* Thu Aug 21 2025 Peng Wu - 1.1.9-5 +- Update CI tests +- Resolves: RHBZ#2382996 + * Tue Aug 12 2025 Peng Wu - 1.1.9-4 - Update for https://fedoraproject.org/wiki/Changes/CMake_drop_install_vars - Resolves: RHBZ#2381327 diff --git a/plans/basic.fmf b/plans/basic.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/basic.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..e1bf8b4 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,5 @@ +test: ./runtest.sh +duration: 50m +framework: beakerlib +require: + - opencc-tools diff --git a/tests/roles/opencc-testing-role/defaults/main.yml b/tests/roles/opencc-testing-role/defaults/main.yml deleted file mode 100644 index af4befe..0000000 --- a/tests/roles/opencc-testing-role/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -role_pkgs_req: - - rsync diff --git a/tests/roles/opencc-testing-role/meta/main.yml b/tests/roles/opencc-testing-role/meta/main.yml deleted file mode 100644 index 6626402..0000000 --- a/tests/roles/opencc-testing-role/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -dependencies: - - role: str-common-init diff --git a/tests/roles/opencc-testing-role/tasks/main.yml b/tests/roles/opencc-testing-role/tasks/main.yml deleted file mode 100644 index 05195e7..0000000 --- a/tests/roles/opencc-testing-role/tasks/main.yml +++ /dev/null @@ -1,47 +0,0 @@ ---- -- name: Check if opencc is installed - register: opencc_testing_runner - find: - paths: "{{ ansible_env.PATH.split(':') }}" - pattern: opencc - -- name: Install opencc-tools - when: opencc_testing_runner.matched == 0 - block: - - name: Installing opencc-tools - package: - name: - - opencc-tools - -- name: Start opencc tests - block: - - name: Execute tests - shell: | - set -e - log_file="{{ remote_artifacts }}/{{ installed_test_name }}.log" - exec 2>>$log_file 1>>$log_file - echo "Starting opencc tests" - TEST=opencc - status="FAIL" - opencc >> "{{ remote_artifacts }}/test.log" <> {{ remote_artifacts }}/test.log - - - name: Check the results - shell: grep "^FAIL" {{ remote_artifacts }}/test.log - register: test_fails - failed_when: False - - - name: Set role result - set_fact: - role_result_failed: "{{ (test_fails.stdout|d|length > 0) or (test_fails.stderr|d|length > 0) }}" - role_result_msg: "{{ test_fails.stdout|d('tests failed.') }}" - - - include_role: - name: str-common-final - diff --git a/tests/runtest.sh b/tests/runtest.sh new file mode 100755 index 0000000..87b6793 --- /dev/null +++ b/tests/runtest.sh @@ -0,0 +1,25 @@ +#!/bin/bash +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + rlShowPackageVersion opencc + rlRun -t -l "VERSION=$(rpm -q opencc --queryformat='%{version}')" 0 "Get VERSION" + FEDORA_VERSION=$(rlGetDistroRelease) + rlLog "FEDORA_VERSION=${DISTRO_RELEASE}" + rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory" + rlRun "pushd $tmp" + rlPhaseEnd + + rlPhaseStartTest + rlRun "set -o pipefail" + rlRun "echo '测试'>input.txt" 0 "Generate input.txt" + rlRun "opencc -i input.txt -o output.txt" 0 "Run opencc tool" + rlRun "grep '測試' output.txt" 0 "Check output.txt" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $tmp" 0 "Remove tmp directory" + rlPhaseEnd +rlJournalEnd diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index aa45e49..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,10 +0,0 @@ -- hosts: localhost - roles: - - role: opencc-testing-role - installed_test_name: opencc - tags: - - classic - - gating - required_packages: - - opencc-tools -