Updated Branches: refs/heads/branch-0.7 fb628180d -> 4ed761972 refs/heads/master ab34e5427 -> 920335c31
BIGTOP-1132. Phoenix RPM specfile does not create symlinks Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/920335c3 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/920335c3 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/920335c3 Branch: refs/heads/master Commit: 920335c31b2798106eea5d78c500b560babd7c26 Parents: ab34e54 Author: Andrew Purtell <[email protected]> Authored: Mon Oct 28 17:59:59 2013 -0400 Committer: Andrew Purtell <[email protected]> Committed: Mon Oct 28 17:59:59 2013 -0400 ---------------------------------------------------------------------- .../src/rpm/phoenix/SPECS/phoenix.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/920335c3/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 6ef1696..1776b45 100644 --- a/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec +++ b/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec @@ -111,15 +111,6 @@ bash %{SOURCE2} \ --build-dir=build \ --doc-dir=%{doc_phoenix} \ --prefix=$RPM_BUILD_ROOT - -%post -%{alternatives_cmd} --install %{etc_phoenix_conf} %{name}-conf %{etc_phoenix_conf_dist} 30 - -%preun -if [ "$1" = 0 ]; then - %{alternatives_cmd} --remove %{name}-conf %{etc_phoenix_conf_dist} || : -fi - # Pull zookeeper, hadoop, hadoop-mapreduce, hadoop-yarn, and hbase deps from their packages rm -f $RPM_BUILD_ROOT/%{lib_phoenix}/zookeeper*.jar ln -f -s %{zookeeper_home}/zookeeper.jar $RPM_BUILD_ROOT/%{lib_phoenix} @@ -130,11 +121,20 @@ ln -f -s %{hadoop_home}/hadoop-common.jar $RPM_BUILD_ROOT/%{lib_phoenix} ln -f -s %{hadoop_mapreduce_home}/hadoop-mapreduce-client-core.jar $RPM_BUILD_ROOT/%{lib_phoenix} ln -f -s %{hadoop_yarn_home}/hadoop-yarn-api.jar $RPM_BUILD_ROOT/%{lib_phoenix} ln -f -s %{hadoop_yarn_home}/hadoop-yarn-common.jar $RPM_BUILD_ROOT/%{lib_phoenix} - rm -f $RPM_BUILD_ROOT/%{lib_phoenix}/hbase*.jar ln -f -s %{hbase_home}/hbase.jar $RPM_BUILD_ROOT/%{lib_phoenix} +%post +%{alternatives_cmd} --install %{etc_phoenix_conf} %{name}-conf %{etc_phoenix_conf_dist} 30 + + +%preun +if [ "$1" = 0 ]; then + %{alternatives_cmd} --remove %{name}-conf %{etc_phoenix_conf_dist} || : +fi + + ####################### #### FILES SECTION #### #######################
