diff --git a/.gitignore b/.gitignore index 6532150..a00de02 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/zycore-c-*.tar* +/zycore-c-1.4.1.tar.gz +/zycore-c-1.5.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..4d4ee9f --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,22 @@ +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 3e2bce0..3232e8a 100644 --- a/packit.yaml +++ b/packit.yaml @@ -1,6 +1,11 @@ +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 @@ -9,10 +14,12 @@ 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 + - fedora-all \ No newline at end of file diff --git a/sources b/sources index ac111df..a0c231b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zycore-c-ba34692d371cde5f45539b5fa26ea11b09721751.tar.gz) = 03a570bc6415a4aed8183590a56a69b8bdffffcca84383cb411af58b479cad367d5206839ddacd3a0b9a90a6a2c4134d6234f94de386dbfaad73e75ad6d7307b +SHA512 (zycore-c-1.5.0.tar.gz) = f57af4e5c6f919299e673ff4afd19a7e3cc01acaf5cde73db47063eb30881487fa33d2fd5707a3e55a8cd8df4bb4b668bc7273b8b8b5eebea1e78c1c36f715b2 diff --git a/zycore-c.spec b/zycore-c.spec index b9807d1..3794b0a 100644 --- a/zycore-c.spec +++ b/zycore-c.spec @@ -1,10 +1,10 @@ -Name: zycore-c -Version: 1.5.2 - -%global forgeurl https://github.com/zyantific/%{name} -%global commit ba34692d371cde5f45539b5fa26ea11b09721751 +%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 Release: %autorelease Summary: Zyan Core Library for C @@ -12,10 +12,13 @@ License: MIT URL: %{forgeurl} Source0: %{forgesource} -BuildRequires: gcc +# https://github.com/zyantific/zycore-c/issues/59 +ExcludeArch: s390x + BuildRequires: gcc-c++ -BuildRequires: meson >= 1.3 -BuildRequires: pkgconfig(gtest) +BuildRequires: cmake +BuildRequires: ninja-build +BuildRequires: gtest-devel BuildRequires: doxygen %description @@ -38,29 +41,33 @@ BuildArch: noarch The %{name}-doc package contains the documentation for %{name}. %prep -%forgesetup +%autosetup -p1 %build -%meson \ - -Ddoc=enabled \ - -Dtests=enabled \ - -Dexamples=enabled \ -%meson_build +%cmake \ + -GNinja \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DZYCORE_BUILD_SHARED_LIB=ON \ + -DZYCORE_BUILD_TESTS=ON \ + -DZYCORE_BUILD_EXAMPLES=ON \ +%cmake_build %install -%meson_install +%cmake_install + +rm -r %{buildroot}%{_mandir}/man3 %check -%meson_test +%ctest %files %license LICENSE %doc README.md -%{_libdir}/libZycore.so.1* +%{_libdir}/libZycore.so.%{sover}* %files devel %{_includedir}/Zycore/ -%{_libdir}/pkgconfig/zycore.pc +%{_libdir}/cmake/zycore/ %{_libdir}/libZycore.so %files doc