Return-Path: X-Original-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D246D77F9 for ; Tue, 6 Sep 2011 04:44:48 +0000 (UTC) Received: (qmail 97573 invoked by uid 500); 6 Sep 2011 04:44:41 -0000 Delivered-To: apmail-incubator-bigtop-commits-archive@incubator.apache.org Received: (qmail 97478 invoked by uid 500); 6 Sep 2011 04:44:33 -0000 Mailing-List: contact bigtop-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@incubator.apache.org Delivered-To: mailing list bigtop-commits@incubator.apache.org Received: (qmail 97452 invoked by uid 99); 6 Sep 2011 04:44:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Sep 2011 04:44:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Sep 2011 04:44:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 46AED2388A02; Tue, 6 Sep 2011 04:44:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1165496 - in /incubator/bigtop/trunk/bigtop-packages/src/rpm: flume/SPECS/ hadoop/SPECS/ hbase/SPECS/ hive/SPECS/ mahout/SPECS/ oozie/SPECS/ pig/SPECS/ sqoop/SPECS/ zookeeper/SPECS/ Date: Tue, 06 Sep 2011 04:44:02 -0000 To: bigtop-commits@incubator.apache.org From: rvs@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110906044403.46AED2388A02@eris.apache.org> Author: rvs Date: Tue Sep 6 04:44:02 2011 New Revision: 1165496 URL: http://svn.apache.org/viewvc?rev=1165496&view=rev Log: BIGTOP-77. All of our config files should be marked %config and (noreplace) Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec?rev=1165496&r1=1165495&r2=1165496&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec (original) +++ incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec Tue Sep 6 04:44:02 2011 @@ -162,7 +162,7 @@ fi %files %defattr(-,flume,flume) -%config %{etc_flume}.empty +%config(noreplace) %{etc_flume}.empty %doc %{doc_flume} %attr(0755,root,root) %{bin_flume} Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1165496&r1=1165495&r2=1165496&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec (original) +++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Tue Sep 6 04:44:02 2011 @@ -397,8 +397,8 @@ fi %files %defattr(-,root,root) -%config %{etc_hadoop}/conf.empty -/etc/default/hadoop +%config(noreplace) %{etc_hadoop}/conf.empty +%config(noreplace) /etc/default/hadoop %{lib_hadoop} %{bin_hadoop}/%{name} %{man_hadoop}/man1/hadoop.1.*z @@ -450,7 +450,7 @@ fi %files conf-pseudo %defattr(-,root,root) -%config %attr(755,root,root) %{etc_hadoop}/conf.pseudo +%config(noreplace) %attr(755,root,root) %{etc_hadoop}/conf.pseudo %dir %attr(0755,root,hadoop) /var/lib/%{name} %dir %attr(1777,root,hadoop) /var/lib/%{name}/cache @@ -468,7 +468,7 @@ fi #%defattr(-,root,root) #%attr(0755,root,root) %{bin_hadoop}/hadoop-fuse-dfs #%attr(0755,root,root) %{man_hadoop}/man1/hadoop-fuse-dfs.1.gz -/etc/default/hadoop-fuse +%config(noreplace) /etc/default/hadoop-fuse %files pipes %defattr(-,root,root) Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec?rev=1165496&r1=1165495&r2=1165496&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec (original) +++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec Tue Sep 6 04:44:02 2011 @@ -206,14 +206,14 @@ ln -s /var/run/hbase %{pids_hbase} ####################### %files %defattr(-,hbase,hbase) -%{_sysconfdir}/default/hbase +%config(noreplace) %{_sysconfdir}/default/hbase %{hbase_home} %{hbase_home}/hbase-*.jar %{webapps_hbase} %defattr(0755,root,root) /usr/bin/hbase -%config %{etc_hbase}/conf +%config(noreplace) %{etc_hbase}/conf %files doc %defattr(-,root,root) Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec?rev=1165496&r1=1165495&r2=1165496&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec (original) +++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec Tue Sep 6 04:44:02 2011 @@ -185,7 +185,7 @@ fi ####################### %files %defattr(-,root,root,755) -%config %{etc_hive}/conf.dist +%config(noreplace) %{etc_hive}/conf.dist %{usr_lib_hive} %{bin_hive}/hive %{var_lib_hive} @@ -196,7 +196,7 @@ fi %define service_macro() \ %files %1 \ %attr(0755,root,root)/%{initd_dir}/%{name}-%1 \ -/etc/default/%{name}-%1 \ +%config(noreplace) /etc/default/%{name}-%1 \ %post %1 \ chkconfig --add %{name}-%1 \ \ Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec?rev=1165496&r1=1165495&r2=1165496&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec (original) +++ incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec Tue Sep 6 04:44:02 2011 @@ -89,7 +89,7 @@ fi ####################### %files %defattr(-,root,root,755) -%config %{config_mahout}.dist +%config(noreplace) %{config_mahout}.dist %doc %{doc_mahout} %{lib_mahout} %{bin_mahout}/mahout Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec?rev=1165496&r1=1165495&r2=1165496&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec (original) +++ incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec Tue Sep 6 04:44:02 2011 @@ -139,7 +139,7 @@ fi %{lib_oozie}/oozie.war %{lib_oozie}/oozie-sharelib.tar.gz %{lib_oozie}/oozie-server -%{conf_oozie} +%config(noreplace) %{conf_oozie} %{initd_dir}/oozie %defattr(-, oozie, oozie) %{data_oozie} Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec?rev=1165496&r1=1165495&r2=1165496&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec (original) +++ incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec Tue Sep 6 04:44:02 2011 @@ -147,7 +147,7 @@ fi ####################### %files %defattr(-,root,root,755) -%config %{etc_pig}/conf.dist +%config(noreplace) %{etc_pig}/conf.dist %doc %{doc_pig} %{lib_pig} %{bin_pig}/pig Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec?rev=1165496&r1=1165495&r2=1165496&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec (original) +++ incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec Tue Sep 6 04:44:02 2011 @@ -118,7 +118,7 @@ chkconfig --del sqoop-metastore %files %defattr(0755,root,root) %{lib_sqoop} -%{_sysconfdir}/sqoop/conf +%config(noreplace) %{_sysconfdir}/sqoop/conf %{_bindir}/sqoop %{_bindir}/sqoop-codegen %{_bindir}/sqoop-create-hive-table Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec?rev=1165496&r1=1165495&r2=1165496&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec (original) +++ incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec Tue Sep 6 04:44:02 2011 @@ -153,7 +153,7 @@ fi ####################### %files %defattr(-,root,root) -%config %{etc_zookeeper}/conf.dist +%config(noreplace) %{etc_zookeeper}/conf.dist %{lib_zookeeper} %{bin_zookeeper}/zookeeper-server %{bin_zookeeper}/zookeeper-client