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 (#13472)

/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.

Authored-by: Sutou Kouhei <kou@clear-code.com>
Signed-off-by: Sutou Kouhei <kou@clear-code.com>
  • Loading branch information
kou committed Jul 1, 2022
1 parent 5241914 commit 38918ef
Show file tree
Hide file tree
Showing 2 changed files with 103 additions and 36 deletions.
32 changes: 32 additions & 0 deletions dev/release/verify-yum.sh
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"
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,17 @@ 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"
install_command="dnf install -y --enablerepo=powertools"
info_command="dnf info --enablerepo=powertools"
;;
centos-*)
distribution_prefix="centos"
Expand Down Expand Up @@ -244,3 +259,20 @@ if [ "${have_parquet}" = "yes" ]; then
fi
echo "::endgroup::"
fi

echo "::group::Test coexistence with old library"
${uninstall_command} apache-arrow-release
if ${install_command} \
https://apache.jfrog.io/artifactory/arrow/${distribution_prefix}/${repository_version}/apache-arrow-release-latest.rpm; then
${clean_command} all
if [ "${have_arrow_libs}" = "yes" ]; then
${install_command} arrow-libs
else
major_version=$(echo ${VERSION} | grep -E -o '^[0-9]+')
previous_major_version="$((${major_version} - 1))"
if ${info_command} arrow${previous_major_version}-libs; then
${install_command} arrow${previous_major_version}-libs
fi
fi
fi
echo "::endgroup::"

0 comments on commit 38918ef

Please sign in to comment.