From 8f56ef128ce1592cb13c64e267874baf63bba3a0 Mon Sep 17 00:00:00 2001 From: topazus Date: Dec 26 2023 06:13:55 +0000 Subject: fix --- diff --git a/groonga.spec b/groonga.spec index 3b794a9..fafe932 100644 --- a/groonga.spec +++ b/groonga.spec @@ -18,7 +18,6 @@ BuildRequires: msgpack-devel BuildRequires: zeromq-devel BuildRequires: libevent-devel BuildRequires: libedit-devel -BuildRequires: systemd-rpm-macros BuildRequires: libstemmer-devel BuildRequires: openssl-devel BuildRequires: libzstd-devel @@ -28,9 +27,13 @@ BuildRequires: xxhash-devel BuildRequires: libarrow-devel %endif +%if 0%{?fedora} >= 40 BuildRequires: blosc2-devel # required by blosc2-devel BuildRequires: zlib-ng-devel +%endif + +BuildRequires: systemd-rpm-macros Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-plugin-suggest = %{version}-%{release} @@ -149,12 +152,28 @@ This package contains the tools for Groonga. %cmake \ -GNinja \ -DCMAKE_BUILD_TYPE=Release \ - -DGRN_WITH_MRUBY=ON \ -DGRN_FOR_RHEL=ON \ - -DGRN_WITH_BLOSC=OFF \ %ifnarch %{ix86} -DGRN_WITH_APACHE_ARROW=ON \ %endif + -DGRN_WITH_ZLIB=ON \ + -DGRN_WITH_ZSTD=ON \ + -DGRN_WITH_RAPIDJSON=ON \ + -DGRN_WITH_MECAB=ON \ + -DGRN_WITH_KYTEA=OFF \ + -DGRN_WITH_LIBSTEMMER=ON \ + -DGRN_WITH_ZEROMQ=ON \ + -DGRN_WITH_LIBEVENT=ON \ + -DGRN_WITH_MESSAGE_PACK=ON \ + -DGRN_WITH_XXHASH=ON \ + -DGRN_WITH_LZ4=ON \ + -DGRN_WITH_ROARING_BITMAPS=ON \ +%if 0%{?fedora} >= 40 + -DGRN_WITH_BLOSC=ON \ +%else + -DGRN_WITH_BLOSC=OFF \ +%endif + -DGRN_WITH_MRUBY=ON \ -DGRN_WITH_MUNIN_PLUGINS=ON \ -DGRN_WITH_DOC=ON \ -DGRN_WITH_EXAMPLES=ON \ diff --git a/packit.yaml b/packit.yaml index c2e942e..9c92507 100644 --- a/packit.yaml +++ b/packit.yaml @@ -1,5 +1,6 @@ upstream_package_name: groonga upstream_project_url: https://github.com/groonga/groonga +upstream_tag_template: v{version} downstream_package_name: groonga