diff --git a/.gitignore b/.gitignore index a00de02..6532150 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/zycore-c-1.4.1.tar.gz -/zycore-c-1.5.0.tar.gz +/zycore-c-*.tar* 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..ac111df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zycore-c-1.5.0.tar.gz) = f57af4e5c6f919299e673ff4afd19a7e3cc01acaf5cde73db47063eb30881487fa33d2fd5707a3e55a8cd8df4bb4b668bc7273b8b8b5eebea1e78c1c36f715b2 +SHA512 (zycore-c-ba34692d371cde5f45539b5fa26ea11b09721751.tar.gz) = 03a570bc6415a4aed8183590a56a69b8bdffffcca84383cb411af58b479cad367d5206839ddacd3a0b9a90a6a2c4134d6234f94de386dbfaad73e75ad6d7307b diff --git a/zycore-c.spec b/zycore-c.spec index 3794b0a..b9807d1 100644 --- a/zycore-c.spec +++ b/zycore-c.spec @@ -1,10 +1,10 @@ -%global forgeurl https://github.com/zyantific/zycore-c -Version: 1.5.0 +Name: zycore-c +Version: 1.5.2 + +%global forgeurl https://github.com/zyantific/%{name} +%global commit ba34692d371cde5f45539b5fa26ea11b09721751 %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