Return-Path: 
 <commits-return-2495-apmail-zookeeper-commits-archive=zookeeper.apache.org@zookeeper.apache.org>
X-Original-To: apmail-zookeeper-commits-archive@www.apache.org
Delivered-To: apmail-zookeeper-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 4A154DE7D
	for <apmail-zookeeper-commits-archive@www.apache.org>;
 Sat, 30 Jun 2012 06:17:22 +0000 (UTC)
Received: (qmail 43995 invoked by uid 500); 30 Jun 2012 06:17:21 -0000
Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org
Received: (qmail 43911 invoked by uid 500); 30 Jun 2012 06:17:20 -0000
Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@zookeeper.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@zookeeper.apache.org>
List-Post: <mailto:commits@zookeeper.apache.org>
List-Id: <commits.zookeeper.apache.org>
Reply-To: dev@<zookeeper.apache.org>
Delivered-To: mailing list commits@zookeeper.apache.org
Received: (qmail 43873 invoked by uid 99); 30 Jun 2012 06:17:19 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Jun 2012 06:17:19 +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; Sat, 30 Jun 2012 06:17:16 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 9D478238899C
	for <commits@zookeeper.apache.org>; Sat, 30 Jun 2012 06:16:55 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r1355648 - in /zookeeper/branches/branch-3.4: CHANGES.txt
 build.xml src/contrib/zkpython/build.xml
 src/contrib/zkpython/src/packages/rpm/spec/zkpython.spec
 src/packages/rpm/spec/zookeeper.spec
Date: Sat, 30 Jun 2012 06:16:54 -0000
To: commits@zookeeper.apache.org
From: phunt@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120630061655.9D478238899C@eris.apache.org>

Author: phunt
Date: Sat Jun 30 06:16:53 2012
New Revision: 1355648

URL: http://svn.apache.org/viewvc?rev=1355648&view=rev
Log:
ZOOKEEPER-1210. Can't build ZooKeeper RPM with RPM >= 4.6.0 (i.e. on RHEL 6 and Fedora >= 10) (Tadeusz Andrzej Kadłubowski via phunt)

Modified:
    zookeeper/branches/branch-3.4/CHANGES.txt
    zookeeper/branches/branch-3.4/build.xml
    zookeeper/branches/branch-3.4/src/contrib/zkpython/build.xml
    zookeeper/branches/branch-3.4/src/contrib/zkpython/src/packages/rpm/spec/zkpython.spec
    zookeeper/branches/branch-3.4/src/packages/rpm/spec/zookeeper.spec

Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1355648&r1=1355647&r2=1355648&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Sat Jun 30 06:16:53 2012
@@ -65,6 +65,9 @@ BUGFIXES:
     zookeeper will not start. Better to create the directory and start
     (suja s via phunt)
 
+  ZOOKEEPER-1210. Can't build ZooKeeper RPM with RPM >= 4.6.0 (i.e. on
+    RHEL 6 and Fedora >= 10) (Tadeusz Andrzej Kadłubowski via phunt)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1389. it would be nice if start-foreground used exec $JAVA

Modified: zookeeper/branches/branch-3.4/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/build.xml?rev=1355648&r1=1355647&r2=1355648&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/build.xml (original)
+++ zookeeper/branches/branch-3.4/build.xml Sat Jun 30 06:16:53 2012
@@ -993,7 +993,7 @@
           </replacetokens>
         </filterchain>
       </copy>
-      <rpm specFile="zookeeper.spec" command="-ba" topDir="${package.buildroot}" cleanBuildDir="true" failOnError="true"
+      <rpm specFile="zookeeper.spec" command="-ba --buildroot=${package.buildroot}/BUILD" topDir="${package.buildroot}" cleanBuildDir="true" failOnError="true"
 />
       <copy todir="${build.dir}/" flatten="true">
         <fileset dir="${package.buildroot}/RPMS">

Modified: zookeeper/branches/branch-3.4/src/contrib/zkpython/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/contrib/zkpython/build.xml?rev=1355648&r1=1355647&r2=1355648&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/contrib/zkpython/build.xml (original)
+++ zookeeper/branches/branch-3.4/src/contrib/zkpython/build.xml Sat Jun 30 06:16:53 2012
@@ -141,7 +141,7 @@
         </filterchain>
       </copy>
 
-      <rpm specFile="${name}.spec" command="-ba" topDir="${package.buildroot}" cleanBuildDir="true" failOnError="true" />
+      <rpm specFile="${name}.spec" command="-ba --buildroot=${package.buildroot}/BUILD" topDir="${package.buildroot}" cleanBuildDir="true" failOnError="true" />
       <copy todir="${build.dir}/" flatten="true">
         <fileset dir="${package.buildroot}/RPMS">
           <include name="**/*.rpm" />

Modified: zookeeper/branches/branch-3.4/src/contrib/zkpython/src/packages/rpm/spec/zkpython.spec
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/contrib/zkpython/src/packages/rpm/spec/zkpython.spec?rev=1355648&r1=1355647&r2=1355648&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/contrib/zkpython/src/packages/rpm/spec/zkpython.spec (original)
+++ zookeeper/branches/branch-3.4/src/contrib/zkpython/src/packages/rpm/spec/zkpython.spec Sat Jun 30 06:16:53 2012
@@ -52,7 +52,6 @@ Version: %{version}
 Release: %{release} 
 Source0: %{_python_lib}
 Prefix: %{_prefix}
-Buildroot: %{_build_dir}
 Requires: zookeeper-lib == %{version}
 AutoReqProv: no
 Provides: zkpython

Modified: zookeeper/branches/branch-3.4/src/packages/rpm/spec/zookeeper.spec
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/packages/rpm/spec/zookeeper.spec?rev=1355648&r1=1355647&r2=1355648&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/packages/rpm/spec/zookeeper.spec (original)
+++ zookeeper/branches/branch-3.4/src/packages/rpm/spec/zookeeper.spec Sat Jun 30 06:16:53 2012
@@ -70,7 +70,6 @@ Prefix: %{_conf_dir}
 Prefix: %{_log_dir}
 Prefix: %{_pid_dir}
 Prefix: %{_var_dir}
-Buildroot: %{_build_dir}
 Requires: sh-utils, textutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service, jdk >= 1.6
 AutoReqProv: no
 Provides: zookeeper