Return-Path: X-Original-To: apmail-bigtop-commits-archive@www.apache.org Delivered-To: apmail-bigtop-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 87E2D10998 for ; Wed, 25 Sep 2013 21:35:33 +0000 (UTC) Received: (qmail 64310 invoked by uid 500); 25 Sep 2013 21:35:25 -0000 Delivered-To: apmail-bigtop-commits-archive@bigtop.apache.org Received: (qmail 64125 invoked by uid 500); 25 Sep 2013 21:35:22 -0000 Mailing-List: contact commits-help@bigtop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@bigtop.apache.org Delivered-To: mailing list commits@bigtop.apache.org Received: (qmail 62030 invoked by uid 99); 25 Sep 2013 21:35:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Sep 2013 21:35:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 419A290A402; Wed, 25 Sep 2013 21:35:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rvs@apache.org To: commits@bigtop.apache.org Date: Wed, 25 Sep 2013 21:35:17 -0000 Message-Id: In-Reply-To: <96cd1153b24845cb95dd13c80de7548a@git.apache.org> References: <96cd1153b24845cb95dd13c80de7548a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/5] git commit: BIGTOP-1095. oozie deb packaging doesn't remove tomcat alternatives BIGTOP-1095. oozie deb packaging doesn't remove tomcat alternatives Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/3d5a79f9 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/3d5a79f9 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/3d5a79f9 Branch: refs/heads/master Commit: 3d5a79f9bc2eb39075d994f9c3ed5c79757bda1a Parents: 40801ba Author: Roman Shaposhnik Authored: Wed Sep 25 12:17:24 2013 -0700 Committer: Roman Shaposhnik Committed: Wed Sep 25 12:20:25 2013 -0700 ---------------------------------------------------------------------- bigtop-packages/src/deb/oozie/oozie.prerm | 2 ++ bigtop-packages/src/rpm/oozie/SPECS/oozie.spec | 3 +++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/3d5a79f9/bigtop-packages/src/deb/oozie/oozie.prerm ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/oozie/oozie.prerm b/bigtop-packages/src/deb/oozie/oozie.prerm index aecfdf9..59a0b31 100644 --- a/bigtop-packages/src/deb/oozie/oozie.prerm +++ b/bigtop-packages/src/deb/oozie/oozie.prerm @@ -39,6 +39,8 @@ set -e case "$1" in remove|upgrade|deconfigure) + update-alternatives --remove oozie-tomcat-conf /etc/oozie/conf/tomcat-deployment.default || : + update-alternatives --remove oozie-tomcat-conf /etc/oozie/conf/tomcat-deployment.secure || : update-alternatives --remove oozie-conf /etc/oozie/conf.dist || : ;; http://git-wip-us.apache.org/repos/asf/bigtop/blob/3d5a79f9/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec index 74c9d23..67049af 100644 --- a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec +++ b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec @@ -170,6 +170,8 @@ if [ "$1" = 0 ]; then rm /etc/oozie/conf/tomcat-deployment /sbin/service oozie stop > /dev/null /sbin/chkconfig --del oozie + %{alternatives_cmd} --remove %{name}-tomcat-conf %{conf_tomcat}.default || : + %{alternatives_cmd} --remove %{name}-tomcat-conf %{conf_tomcat}.secure || : %{alternatives_cmd} --remove %{name}-conf %{conf_oozie_dist} || : fi @@ -192,6 +194,7 @@ fi %{lib_oozie}/libext %{initd_dir}/oozie %defattr(-, oozie, oozie) +%dir %{_sysconfdir}/%{name} %dir %{_localstatedir}/log/oozie %dir %{_localstatedir}/run/oozie %attr(0755,oozie,oozie) %{data_oozie}