From cf8fcfc87e0bd5776a73847b85eb53489d475065 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:49:03 +0000 Subject: [PATCH 01/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 49c06c755e0a65e10ccce1116fc16b03a3571ae2 Mon Sep 17 00:00:00 2001 From: topazus Date: Tue, 2 Jan 2024 23:47:06 +0800 Subject: [PATCH 02/12] add packit file --- 65.patch | 32 -------------------------------- packit.yaml | 25 +++++++++++++++++++++++++ zycore-c.spec | 32 +++++++------------------------- 3 files changed, 32 insertions(+), 57 deletions(-) delete mode 100644 65.patch create mode 100644 packit.yaml diff --git a/65.patch b/65.patch deleted file mode 100644 index ec09ebf..0000000 --- a/65.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 23e9bd9cba86b1dac9a35a4cadc91a7c42cd036e Mon Sep 17 00:00:00 2001 -From: Felix Wang <77263945+topazus@users.noreply.github.com> -Date: Wed, 7 Jun 2023 04:21:27 -0400 -Subject: [PATCH] Set DOXYGEN_GENERATE_MAN config option to generate manpages - ---- - CMakeLists.txt | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e14145c..0634d13 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -228,12 +228,18 @@ install(DIRECTORY "include/" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - - find_package(Doxygen) - if (DOXYGEN_FOUND) -+ set(DOXYGEN_GENERATE_MAN YES) - doxygen_add_docs(ZycoreDoc "include/Zycore/" ALL) - install( - DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html/" - DESTINATION "${CMAKE_INSTALL_DOCDIR}/api" - COMPONENT Documentation - ) -+ install( -+ DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/man/man3/" -+ DESTINATION "${CMAKE_INSTALL_MANDIR}/man3" -+ COMPONENT Documentation -+ ) - endif() - - # =============================================================================================== # diff --git a/packit.yaml b/packit.yaml new file mode 100644 index 0000000..3232e8a --- /dev/null +++ b/packit.yaml @@ -0,0 +1,25 @@ +upstream_package_name: zycore-c +upstream_project_url: https://github.com/zyantific/zycore-c +upstream_tag_template: v{version} + +downstream_package_name: zycore-c + +specfile_path: zycore-c.spec + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-all + + - job: koji_build + trigger: commit + allowed_pr_authors: ["packit", "topazus"] + allowed_committers: ["packit", "topazus"] + dist_git_branches: + - fedora-all + + - job: bodhi_update + trigger: commit + dist_git_branches: + - fedora-all \ No newline at end of file diff --git a/zycore-c.spec b/zycore-c.spec index 1c7a0c4..7a500f2 100644 --- a/zycore-c.spec +++ b/zycore-c.spec @@ -8,14 +8,13 @@ Summary: Zyan Core Library for C License: MIT URL: https://github.com/zyantific/zycore-c Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -# Set DOXYGEN_GENERATE_MAN config option to generate manpages -Patch0: https://github.com/zyantific/zycore-c/pull/65.patch # https://github.com/zyantific/zycore-c/issues/59 ExcludeArch: s390x -BuildRequires: gcc gcc-c++ +BuildRequires: gcc-c++ BuildRequires: cmake +BuildRequires: ninja-build BuildRequires: gtest-devel BuildRequires: doxygen @@ -43,6 +42,8 @@ The %{name}-doc package contains the documentation for %{name}. %build %cmake \ + -GNinja \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DZYCORE_BUILD_SHARED_LIB=ON \ -DZYCORE_BUILD_TESTS=ON \ -DZYCORE_BUILD_EXAMPLES=ON \ @@ -60,32 +61,13 @@ The %{name}-doc package contains the documentation for %{name}. %{_libdir}/libZycore.so.%{sover}* %files devel -%dir %{_includedir}/Zycore -%dir %{_includedir}/Zycore/API -%dir %{_includedir}/Zycore/Internal -%{_includedir}/Zycore/*.h -%{_includedir}/Zycore/API/*.h -%{_includedir}/Zycore/Internal/*.h -%dir %{_libdir}/cmake/zycore -%{_libdir}/cmake/zycore/*.cmake +%{_includedir}/Zycore/ +%{_libdir}/cmake/zycore/ %{_libdir}/libZycore.so -%{_mandir}/man3/* %files doc %license LICENSE -%dir %{_datadir}/doc/Zycore -%dir %{_datadir}/doc/Zycore/api -%dir %{_datadir}/doc/Zycore/api/search -%{_datadir}/doc/Zycore/api/*.css -%{_datadir}/doc/Zycore/api/*.png -%{_datadir}/doc/Zycore/api/*.html -%{_datadir}/doc/Zycore/api/*.map -%{_datadir}/doc/Zycore/api/*.md5 -%{_datadir}/doc/Zycore/api/*.js -%{_datadir}/doc/Zycore/api/*.svg -%{_datadir}/doc/Zycore/api/search/*.js -%{_datadir}/doc/Zycore/api/search/*.svg -%{_datadir}/doc/Zycore/api/search/*.css +%{_docdir}/Zycore/ %changelog %autochangelog From 6e6365649a62ddf0c66a3cbce154c467fff9b7a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:20:37 +0000 Subject: [PATCH 03/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0ba50fb4462859a8fcdf6bea6eaf6e9ff16718d1 Mon Sep 17 00:00:00 2001 From: Felix Wang Date: Sat, 17 Feb 2024 00:38:52 +0800 Subject: [PATCH 04/12] update to 1.5.0 --- .gitignore | 1 + sources | 2 +- zycore-c.spec | 13 +++++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 320826d..a00de02 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /zycore-c-1.4.1.tar.gz +/zycore-c-1.5.0.tar.gz diff --git a/sources b/sources index adedfb7..a0c231b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zycore-c-1.4.1.tar.gz) = 8cfb1b5dc49ae1d3216398b125125ced52603c6ae7772d08ff5f8c7be0ab7d7aa257f70678f7afa7805b7937520808fa5968ae98bfe7604e46c56e79460c0b5e +SHA512 (zycore-c-1.5.0.tar.gz) = f57af4e5c6f919299e673ff4afd19a7e3cc01acaf5cde73db47063eb30881487fa33d2fd5707a3e55a8cd8df4bb4b668bc7273b8b8b5eebea1e78c1c36f715b2 diff --git a/zycore-c.spec b/zycore-c.spec index 7a500f2..3794b0a 100644 --- a/zycore-c.spec +++ b/zycore-c.spec @@ -1,13 +1,16 @@ -%global sover 1.4 +%global forgeurl https://github.com/zyantific/zycore-c +Version: 1.5.0 +%forgemeta + +%global sover %{echo %{version} | cut -d '.' -f 1,2} Name: zycore-c -Version: 1.4.1 Release: %autorelease Summary: Zyan Core Library for C License: MIT -URL: https://github.com/zyantific/zycore-c -Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +URL: %{forgeurl} +Source0: %{forgesource} # https://github.com/zyantific/zycore-c/issues/59 ExcludeArch: s390x @@ -52,6 +55,8 @@ The %{name}-doc package contains the documentation for %{name}. %install %cmake_install +rm -r %{buildroot}%{_mandir}/man3 + %check %ctest From 2cc56468916a2e2da458954b3a52ebce64d649b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:59:10 +0000 Subject: [PATCH 05/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 63a0de9848cdbeeb3eb8581f2ff97351121fdab3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:54:54 +0000 Subject: [PATCH 06/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From babccc1582845ebf00b86a70bfd22d859f78cfc8 Mon Sep 17 00:00:00 2001 From: topazus Date: Tue, 11 Feb 2025 16:49:25 +0800 Subject: [PATCH 07/12] 1.5.2 --- .gitignore | 2 ++ .packit.yaml | 22 ---------------------- packit.yaml | 9 +-------- sources | 2 +- zycore-c.spec | 2 +- 5 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 .packit.yaml diff --git a/.gitignore b/.gitignore index a00de02..7ef817f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /zycore-c-1.4.1.tar.gz /zycore-c-1.5.0.tar.gz +/zycore-c-1.5.1.tar.gz +/zycore-c-1.5.2.tar.gz diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index 4d4ee9f..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,22 +0,0 @@ -upstream_package_name: zycore-c -upstream_project_url: https://github.com/zyantific/zycore-c - -downstream_package_name: zycore-c - -specfile_path: zycore-c.spec - -jobs: - - job: pull_from_upstream - trigger: release - dist_git_branches: - - fedora-all - - - job: koji_build - trigger: commit - dist_git_branches: - - fedora-all - - - job: bodhi_update - trigger: commit - dist_git_branches: - - fedora-all diff --git a/packit.yaml b/packit.yaml index 3232e8a..3e2bce0 100644 --- a/packit.yaml +++ b/packit.yaml @@ -1,11 +1,6 @@ -upstream_package_name: zycore-c upstream_project_url: https://github.com/zyantific/zycore-c upstream_tag_template: v{version} -downstream_package_name: zycore-c - -specfile_path: zycore-c.spec - jobs: - job: pull_from_upstream trigger: release @@ -14,12 +9,10 @@ jobs: - job: koji_build trigger: commit - allowed_pr_authors: ["packit", "topazus"] - allowed_committers: ["packit", "topazus"] dist_git_branches: - fedora-all - job: bodhi_update trigger: commit dist_git_branches: - - fedora-all \ No newline at end of file + - fedora-all diff --git a/sources b/sources index a0c231b..d95fedc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zycore-c-1.5.0.tar.gz) = f57af4e5c6f919299e673ff4afd19a7e3cc01acaf5cde73db47063eb30881487fa33d2fd5707a3e55a8cd8df4bb4b668bc7273b8b8b5eebea1e78c1c36f715b2 +SHA512 (zycore-c-1.5.2.tar.gz) = dd410010b99e11f40ad5234d21c9857bd57e47591ed9caec45c6199bfd690f7158499659c874680f2087bfd2b6eee41f08e95c367f83af3585690ce7d20ccb87 diff --git a/zycore-c.spec b/zycore-c.spec index 3794b0a..c2d5081 100644 --- a/zycore-c.spec +++ b/zycore-c.spec @@ -1,5 +1,5 @@ %global forgeurl https://github.com/zyantific/zycore-c -Version: 1.5.0 +Version: 1.5.2 %forgemeta %global sover %{echo %{version} | cut -d '.' -f 1,2} From c522a80cb0e6edd48710e9117d19a0e8d7dbaa36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:22:04 +0000 Subject: [PATCH 08/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 80be453dc0ce856b2c0eed9e12e6ceb1f3a3df1d Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Sun, 28 Sep 2025 03:28:25 +0800 Subject: [PATCH 09/12] Update to snapshot 06c17a7fa9f538b512360e6c78a57b463dcbf9e4 --- .gitignore | 5 +---- sources | 2 +- zycore-c.spec | 41 +++++++++++++++++------------------------ 3 files changed, 19 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index 7ef817f..6532150 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/zycore-c-1.4.1.tar.gz -/zycore-c-1.5.0.tar.gz -/zycore-c-1.5.1.tar.gz -/zycore-c-1.5.2.tar.gz +/zycore-c-*.tar* diff --git a/sources b/sources index d95fedc..c6fa383 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zycore-c-1.5.2.tar.gz) = dd410010b99e11f40ad5234d21c9857bd57e47591ed9caec45c6199bfd690f7158499659c874680f2087bfd2b6eee41f08e95c367f83af3585690ce7d20ccb87 +SHA512 (zycore-c-06c17a7fa9f538b512360e6c78a57b463dcbf9e4.tar.gz) = 560d8330239fe547d38eb5674f89b7c6edb44a19e9566a9d0b203645bbbb048c68b096e1bd16cb7a374fbd2ce191020aa5edb83597806f324489f718ddf14488 diff --git a/zycore-c.spec b/zycore-c.spec index c2d5081..0e21d23 100644 --- a/zycore-c.spec +++ b/zycore-c.spec @@ -1,10 +1,10 @@ -%global forgeurl https://github.com/zyantific/zycore-c +Name: zycore-c Version: 1.5.2 + +%global forgeurl https://github.com/zyantific/%{name} +%global commit 06c17a7fa9f538b512360e6c78a57b463dcbf9e4 %forgemeta -%global sover %{echo %{version} | cut -d '.' -f 1,2} - -Name: zycore-c Release: %autorelease Summary: Zyan Core Library for C @@ -12,13 +12,10 @@ License: MIT URL: %{forgeurl} Source0: %{forgesource} -# https://github.com/zyantific/zycore-c/issues/59 -ExcludeArch: s390x - +BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: cmake -BuildRequires: ninja-build -BuildRequires: gtest-devel +BuildRequires: meson >= 1.3 +BuildRequires: pkgconfig(gtest) BuildRequires: doxygen %description @@ -41,33 +38,29 @@ BuildArch: noarch The %{name}-doc package contains the documentation for %{name}. %prep -%autosetup -p1 +%forgesetup %build -%cmake \ - -GNinja \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DZYCORE_BUILD_SHARED_LIB=ON \ - -DZYCORE_BUILD_TESTS=ON \ - -DZYCORE_BUILD_EXAMPLES=ON \ -%cmake_build +%meson \ + -Ddoc=enabled \ + -Dtests=enabled \ + -Dexamples=enabled \ +%meson_build %install -%cmake_install - -rm -r %{buildroot}%{_mandir}/man3 +%meson_install %check -%ctest +%meson_test %files %license LICENSE %doc README.md -%{_libdir}/libZycore.so.%{sover}* +%{_libdir}/libZycore.so.1* %files devel %{_includedir}/Zycore/ -%{_libdir}/cmake/zycore/ +%{_libdir}/pkgconfig/zycore.pc %{_libdir}/libZycore.so %files doc From d9681a4ba49a995b084e0272e44e8d76002172de Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Sun, 28 Sep 2025 10:19:29 +0800 Subject: [PATCH 10/12] Fix tests on s390x --- sources | 2 +- zycore-c.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index c6fa383..ac111df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zycore-c-06c17a7fa9f538b512360e6c78a57b463dcbf9e4.tar.gz) = 560d8330239fe547d38eb5674f89b7c6edb44a19e9566a9d0b203645bbbb048c68b096e1bd16cb7a374fbd2ce191020aa5edb83597806f324489f718ddf14488 +SHA512 (zycore-c-ba34692d371cde5f45539b5fa26ea11b09721751.tar.gz) = 03a570bc6415a4aed8183590a56a69b8bdffffcca84383cb411af58b479cad367d5206839ddacd3a0b9a90a6a2c4134d6234f94de386dbfaad73e75ad6d7307b diff --git a/zycore-c.spec b/zycore-c.spec index 0e21d23..b9807d1 100644 --- a/zycore-c.spec +++ b/zycore-c.spec @@ -2,7 +2,7 @@ Name: zycore-c Version: 1.5.2 %global forgeurl https://github.com/zyantific/%{name} -%global commit 06c17a7fa9f538b512360e6c78a57b463dcbf9e4 +%global commit ba34692d371cde5f45539b5fa26ea11b09721751 %forgemeta Release: %autorelease From f4976635d47d50ad071244748846d497c6f209cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:12:14 +0000 Subject: [PATCH 11/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From c864314c0dc7ca752f2866d585d9e05a29a6de6c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:44:50 +0000 Subject: [PATCH 12/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild