[arrow] branch master updated: ARROW-16785: [Packaging][Linux] Add FindThrift.cmake (#13337)

[ks...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kszucs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 5fe3a606f1 ARROW-16785: [Packaging][Linux] Add FindThrift.cmake (#13337)
5fe3a606f1 is described below

commit 5fe3a606f16b183cf706ae8d9a4adaff593c18a1
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Wed Jun 8 16:51:03 2022 +0900

    ARROW-16785: [Packaging][Linux] Add FindThrift.cmake (#13337)
    
    This is a follow-up of ARROW-16721/#13292.
    
    Authored-by: Sutou Kouhei <ko...@clear-code.com>
    Signed-off-by: Krisztián Szűcs <sz...@gmail.com>
---
 dev/tasks/linux-packages/apache-arrow/debian/libarrow-dev.install | 2 +-
 dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in           | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev/tasks/linux-packages/apache-arrow/debian/libarrow-dev.install b/dev/tasks/linux-packages/apache-arrow/debian/libarrow-dev.install
index 81789b9d56..4f600692ce 100644
--- a/dev/tasks/linux-packages/apache-arrow/debian/libarrow-dev.install
+++ b/dev/tasks/linux-packages/apache-arrow/debian/libarrow-dev.install
@@ -5,7 +5,7 @@ usr/lib/*/cmake/arrow/ArrowTargets*.cmake
 usr/lib/*/cmake/arrow/Find*Alt.cmake
 usr/lib/*/cmake/arrow/FindArrow.cmake
 usr/lib/*/cmake/arrow/FindBrotli.cmake
-usr/lib/*/cmake/arrow/Find[Suz]*.cmake
+usr/lib/*/cmake/arrow/Find[STuz]*.cmake
 usr/lib/*/cmake/arrow/arrow-config.cmake
 usr/lib/*/libarrow.a
 usr/lib/*/libarrow.so
diff --git a/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in b/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
index 8000a2b253..c671ce8aed 100644
--- a/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
+++ b/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
@@ -64,11 +64,12 @@
 %define use_python (%{rhel} >= 8)
 # TODO: Enable this. This works on local but is fragile on GitHub Actions and
 # Travis CI.
-# %%define use_s3 (%{rhel} >= 8)
+# %%define use_s3 (%%{rhel} >= 8)
 %define use_s3 0
 
 %define have_rapidjson (%{rhel} != 8)
 %define have_re2 (%{rhel} >= 8)
+%define have_thrift (%{rhel} >= 8)
 %define have_utf8proc (%{rhel} >= 9)
 %define have_zstd (!%{is_amazon_linux})
 
@@ -122,7 +123,9 @@ BuildRequires:	rapidjson-devel
 BuildRequires:	re2-devel
 %endif
 BuildRequires:	snappy-devel
+%if %{have_thrift}
 BuildRequires:	thrift-devel
+%endif
 %if %{have_utf8proc}
 BuildRequires:	utf8proc-devel
 %endif
@@ -294,6 +297,9 @@ Libraries and header files for Apache Arrow C++.
 %{_libdir}/cmake/arrow/FindArrow.cmake
 %{_libdir}/cmake/arrow/FindBrotli.cmake
 %{_libdir}/cmake/arrow/FindSnappy.cmake
+%if %{have_thrift}
+%{_libdir}/cmake/arrow/FindThrift.cmake
+%endif
 %if %{use_flight}
 %{_libdir}/cmake/arrow/Findc-aresAlt.cmake
 %endif