Fix CentOS8 packaging (#87)

This commit is contained in:
Marko Budiselić 2021-01-29 14:48:55 +01:00 committed by GitHub
parent e4852cc5e3
commit 42c245df8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 0 deletions

View File

@ -30,6 +30,7 @@ BuildRequires: systemd
# This is needed to prevent Python compilation errors when building the RPM # This is needed to prevent Python compilation errors when building the RPM
# package # package
# https://github.com/scylladb/scylla/issues/2235 # https://github.com/scylladb/scylla/issues/2235
%if 0%{?rhel} < 8
%global __os_install_post \ %global __os_install_post \
/usr/lib/rpm/redhat/brp-compress \ /usr/lib/rpm/redhat/brp-compress \
%{!?__debug_package:\ %{!?__debug_package:\
@ -39,6 +40,16 @@ BuildRequires: systemd
/usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} \ /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} \
%{!?__jar_repack:/usr/lib/rpm/redhat/brp-java-repack-jars} \ %{!?__jar_repack:/usr/lib/rpm/redhat/brp-java-repack-jars} \
%{nil} %{nil}
%else
%global __os_install_post \
/usr/lib/rpm/brp-compress \
%{!?__debug_package:\
/usr/lib/rpm/brp-strip %{__strip} \
/usr/lib/rpm/brp-strip-comment-note %{__strip} %{__objdump} \
} \
/usr/lib/rpm/brp-strip-static-archive %{__strip} \
%{nil}
%endif
%define _rpmdir %_topdir/RPMS %define _rpmdir %_topdir/RPMS
%define _srcrpmdir %_topdir/SRPMS %define _srcrpmdir %_topdir/SRPMS

View File

@ -30,6 +30,7 @@ BuildRequires: systemd
# This is needed to prevent Python compilation errors when building the RPM # This is needed to prevent Python compilation errors when building the RPM
# package # package
# https://github.com/scylladb/scylla/issues/2235 # https://github.com/scylladb/scylla/issues/2235
%if 0%{?rhel} < 8
%global __os_install_post \ %global __os_install_post \
/usr/lib/rpm/redhat/brp-compress \ /usr/lib/rpm/redhat/brp-compress \
%{!?__debug_package:\ %{!?__debug_package:\
@ -39,6 +40,16 @@ BuildRequires: systemd
/usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} \ /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} \
%{!?__jar_repack:/usr/lib/rpm/redhat/brp-java-repack-jars} \ %{!?__jar_repack:/usr/lib/rpm/redhat/brp-java-repack-jars} \
%{nil} %{nil}
%else
%global __os_install_post \
/usr/lib/rpm/brp-compress \
%{!?__debug_package:\
/usr/lib/rpm/brp-strip %{__strip} \
/usr/lib/rpm/brp-strip-comment-note %{__strip} %{__objdump} \
} \
/usr/lib/rpm/brp-strip-static-archive %{__strip} \
%{nil}
%endif
%define _rpmdir %_topdir/RPMS %define _rpmdir %_topdir/RPMS
%define _srcrpmdir %_topdir/SRPMS %define _srcrpmdir %_topdir/SRPMS