Repository: bigtop Updated Branches: refs/heads/master 9a8b0d78b -> 5228576c2
BIGTOP-1344: spec files assume RPMs being built on Red Hat Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/5228576c Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/5228576c Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/5228576c Branch: refs/heads/master Commit: 5228576c24e3d622a688aecea167f6cac6969e76 Parents: 9a8b0d7 Author: Olaf Flebbe <o...@oflebbe.de> Authored: Fri Sep 4 22:18:29 2015 +0200 Committer: Olaf Flebbe <o...@oflebbe.de> Committed: Thu Sep 10 11:21:04 2015 +0200 ---------------------------------------------------------------------- bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec | 6 +++--- bigtop-packages/src/rpm/hbase/SPECS/hbase.spec | 6 +++--- bigtop-packages/src/rpm/hive/SPECS/hive.spec | 6 +++--- bigtop-packages/src/rpm/ignite-hadoop/SPECS/ignite-hadoop.spec | 6 +++--- bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec | 6 +++--- bigtop-packages/src/rpm/pig/SPECS/pig.spec | 6 +++--- bigtop-packages/src/rpm/tez/SPECS/tez.spec | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/5228576c/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec index 4e977e4..5431570 100644 --- a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec +++ b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec @@ -83,9 +83,9 @@ # So for now brp-repack-jars is being deactivated until this is fixed. # See BIGTOP-294 %define __os_install_post \ - /usr/lib/rpm/redhat/brp-compress ; \ - /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} ; \ - /usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} ; \ + %{_rpmconfigdir}/brp-compress ; \ + %{_rpmconfigdir}/brp-strip-static-archive %{__strip} ; \ + %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} ; \ /usr/lib/rpm/brp-python-bytecompile ; \ %{nil} http://git-wip-us.apache.org/repos/asf/bigtop/blob/5228576c/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec b/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec index 59dcf1d..43f4a64 100644 --- a/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec +++ b/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec @@ -60,9 +60,9 @@ # So for now brp-repack-jars is being deactivated until this is fixed. # See BIGTOP-294 %define __os_install_post \ - /usr/lib/rpm/redhat/brp-compress ; \ - /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} ; \ - /usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} ; \ + %{_rpmconfigdir}/brp-compress ; \ + %{_rpmconfigdir}/brp-strip-static-archive %{__strip} ; \ + %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} ; \ /usr/lib/rpm/brp-python-bytecompile ; \ %{nil} %endif http://git-wip-us.apache.org/repos/asf/bigtop/blob/5228576c/bigtop-packages/src/rpm/hive/SPECS/hive.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hive/SPECS/hive.spec b/bigtop-packages/src/rpm/hive/SPECS/hive.spec index 71c3394..80c547b 100644 --- a/bigtop-packages/src/rpm/hive/SPECS/hive.spec +++ b/bigtop-packages/src/rpm/hive/SPECS/hive.spec @@ -215,9 +215,9 @@ Requires: initscripts # So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora %if %{!?suse_version:1}0 && %{!?mgaversion:1}0 %define __os_install_post \ - /usr/lib/rpm/redhat/brp-compress ; \ - /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} ; \ - /usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} ; \ + %{_rpmconfigdir}/brp-compress ; \ + %{_rpmconfigdir}/brp-strip-static-archive %{__strip} ; \ + %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} ; \ /usr/lib/rpm/brp-python-bytecompile ; \ %{nil} # Required for init scripts http://git-wip-us.apache.org/repos/asf/bigtop/blob/5228576c/bigtop-packages/src/rpm/ignite-hadoop/SPECS/ignite-hadoop.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/ignite-hadoop/SPECS/ignite-hadoop.spec b/bigtop-packages/src/rpm/ignite-hadoop/SPECS/ignite-hadoop.spec index 8251ae9..6107094 100644 --- a/bigtop-packages/src/rpm/ignite-hadoop/SPECS/ignite-hadoop.spec +++ b/bigtop-packages/src/rpm/ignite-hadoop/SPECS/ignite-hadoop.spec @@ -58,9 +58,9 @@ # So for now brp-repack-jars is being deactivated until this is fixed. # See BIGTOP-294 #%define __os_install_post \ -# /usr/lib/rpm/redhat/brp-compress ; \ -# /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} ; \ -# /usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} ; \ +# %{_rpmconfigdir}/brp-compress ; \ +# %{_rpmconfigdir}/brp-strip-static-archive %{__strip} ; \ +# %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} ; \ # /usr/lib/rpm/brp-python-bytecompile ; \ # %{nil} %endif http://git-wip-us.apache.org/repos/asf/bigtop/blob/5228576c/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec b/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec index 1212b4a..dfbd7bb 100644 --- a/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec +++ b/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec @@ -61,9 +61,9 @@ # So for now brp-repack-jars is being deactivated until this is fixed. # See BIGTOP-294 %define __os_install_post \ - /usr/lib/rpm/redhat/brp-compress ; \ - /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} ; \ - /usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} ; \ + %{_rpmconfigdir}/brp-compress ; \ + %{_rpmconfigdir}/brp-strip-static-archive %{__strip} ; \ + %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} ; \ /usr/lib/rpm/brp-python-bytecompile ; \ %{nil} %endif http://git-wip-us.apache.org/repos/asf/bigtop/blob/5228576c/bigtop-packages/src/rpm/pig/SPECS/pig.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/pig/SPECS/pig.spec b/bigtop-packages/src/rpm/pig/SPECS/pig.spec index 370b7aa..a96e39d 100644 --- a/bigtop-packages/src/rpm/pig/SPECS/pig.spec +++ b/bigtop-packages/src/rpm/pig/SPECS/pig.spec @@ -34,9 +34,9 @@ # So for now brp-repack-jars is being deactivated until this is fixed. # See BIGTOP-294 %define __os_install_post \ - /usr/lib/rpm/redhat/brp-compress ; \ - /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} ; \ - /usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} ; \ + %{_rpmconfigdir}/brp-compress ; \ + %{_rpmconfigdir}/brp-strip-static-archive %{__strip} ; \ + %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} ; \ /usr/lib/rpm/brp-python-bytecompile ; \ %{nil} http://git-wip-us.apache.org/repos/asf/bigtop/blob/5228576c/bigtop-packages/src/rpm/tez/SPECS/tez.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/tez/SPECS/tez.spec b/bigtop-packages/src/rpm/tez/SPECS/tez.spec index 8d8fe9f..af77c31 100644 --- a/bigtop-packages/src/rpm/tez/SPECS/tez.spec +++ b/bigtop-packages/src/rpm/tez/SPECS/tez.spec @@ -20,9 +20,9 @@ %if %{!?suse_version:1}0 && %{!?mgaversion:1}0 %define __os_install_post \ - /usr/lib/rpm/redhat/brp-compress ; \ - /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} ; \ - /usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} ; \ + %{_rpmconfigdir}/brp-compress ; \ + %{_rpmconfigdir}/brp-strip-static-archive %{__strip} ; \ + %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} ; \ /usr/lib/rpm/brp-python-bytecompile ; \ %{nil}
