Skip to content

Commit

Permalink
ARROW-16765: [Packaging][RPM] Fix conflict with arrow-libs and arrow8…
Browse files Browse the repository at this point in the history
…-libs

/usr/share/doc/arrow/* are conflicted. We should put them into
arrowX-libs.

%doc -> %doc/%license changes aren't required for this fix but it's
better that we mark LICENSE.txt and NOTICE.txt as license related
files.
  • Loading branch information
kou committed Jun 30, 2022
1 parent fc3a479 commit 6b404c2
Show file tree
Hide file tree
Showing 2 changed files with 102 additions and 36 deletions.
31 changes: 31 additions & 0 deletions dev/release/verify-yum.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,20 @@ have_gandiva=yes
have_glib=yes
have_parquet=yes
have_python=yes
have_arrow_libs=no
install_command="dnf install -y --enablerepo=crb"
uninstall_command="dnf remove -y"
clean_command="dnf clean all"
info_command="dnf info --enablerepo=crb"

echo "::group::Prepare repository"

case "${distribution}-${distribution_version}" in
almalinux-8)
distribution_prefix="almalinux"
have_arrow_libs=yes
install_command="dnf install -y --enablerepo=powertools"
info_command="dnf info --enablerepo=powertools"
;;
almalinux-*)
distribution_prefix="almalinux"
Expand All @@ -70,7 +76,11 @@ case "${distribution}-${distribution_version}" in
have_flight=no
have_gandiva=no
have_python=no
have_arrow_libs=yes
install_command="yum install -y"
uninstall_command="yum remove -y"
clean_command="yum clean"
info_command="yum info"
amazon-linux-extras install epel -y
;;
centos-7)
Expand All @@ -80,12 +90,18 @@ case "${distribution}-${distribution_version}" in
have_flight=no
have_gandiva=no
have_python=no
have_arrow_libs=yes
install_command="yum install -y"
uninstall_command="yum remove -y"
clean_command="yum clean"
info_command="yum info"
;;
centos-8)
distribution_prefix="centos"
repository_version+="-stream"
have_arrow_libs=yes
install_command="dnf install -y --enablerepo=powertools"
info_command="dnf info --enablerepo=powertools"
;;
centos-*)
distribution_prefix="centos"
Expand Down Expand Up @@ -244,3 +260,18 @@ if [ "${have_parquet}" = "yes" ]; then
fi
echo "::endgroup::"
fi

echo "::group::Test coexistence with old library"
${uninstall_command} apache-arrow-release
${install_command} \
https://apache.jfrog.io/artifactory/arrow/${distribution_prefix}/${repository_version}/apache-arrow-release-latest.rpm
${clean_command} all
if [ "${have_arrow_libs}" = "yes" ]; then
${install_command} arrow-libs
else
previous_version="$((${VERSION} - 1))"
if ${info_command} arrow${previous_version}-libs; then
${install_command} arrow${previous_version}-libs
fi
fi
echo "::endgroup::"
Loading

0 comments on commit 6b404c2

Please sign in to comment.