Return-Path: 
 <commits-return-4273-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 275FB18FC7
	for <apmail-zookeeper-commits-archive@www.apache.org>;
 Sun, 24 May 2015 06:37:33 +0000 (UTC)
Received: (qmail 15923 invoked by uid 500); 24 May 2015 06:37:33 -0000
Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org
Received: (qmail 15887 invoked by uid 500); 24 May 2015 06:37:33 -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 15876 invoked by uid 99); 24 May 2015 06:37:33 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 May 2015 06:37:33 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 DA82FAC0639
	for <commits@zookeeper.apache.org>; Sun, 24 May 2015 06:37:32 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1681418 - in /zookeeper/branches/branch-3.4: CHANGES.txt
 build.xml src/contrib/zkpython/build.xml
Date: Sun, 24 May 2015 06:37:32 -0000
To: commits@zookeeper.apache.org
From: michim@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150524063732.DA82FAC0639@hades.apache.org>

Author: michim
Date: Sun May 24 06:37:32 2015
New Revision: 1681418

URL: http://svn.apache.org/r1681418
Log:
ZOOKEEPER-2124 Allow Zookeeper version string to have underscore '_' (Chris Nauroth via michim)

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

Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1681418&r1=1681417&r2=1681418&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Sun May 24 06:37:32 2015
@@ -97,6 +97,9 @@ IMPROVEMENTS:
   ZOOKEEPER-2126 Improve exit log messsage of EventThread and SendThread by
   adding SessionId (surendra singh lilhore via rakeshr)
 
+  ZOOKEEPER-2124 Allow Zookeeper version string to have underscore '_'
+  (Chris Nauroth via michim)
+
 Release 3.4.6 - 2014-03-10 
 
 Backward compatible changes:

Modified: zookeeper/branches/branch-3.4/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/build.xml?rev=1681418&r1=1681417&r2=1681418&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/build.xml (original)
+++ zookeeper/branches/branch-3.4/build.xml Sun May 24 06:37:32 2015
@@ -981,10 +981,21 @@ xmlns:maven="antlib:org.apache.maven.art
     </target>
 
     <target name="rpm" depends="package-native, tar" description="Make rpm package">
+      <!--The RPM spec file format disallows hyphen in the version.  Replace with
+          underscore to support version tags like -alpha or -SNAPSHOT.-->
+      <loadresource property="rpm.version">
+        <propertyresource name="version" />
+        <filterchain>
+          <tokenfilter>
+            <replacestring from="-" to="_" />
+          </tokenfilter>
+        </filterchain>
+      </loadresource>
       <subant target="rpm">
         <!--Pass down the version in case its needed again and the target
             distribution directory so contribs know where to install to.-->
         <property name="version" value="${version}"/>
+        <property name="rpm.version" value="${rpm.version}"/>
         <property name="dist.dir" value="${dist.dir}"/>
         <fileset file="${contrib.dir}/build.xml"/>
         <fileset file="${recipes.dir}/build.xml"/>
@@ -1010,7 +1021,7 @@ xmlns:maven="antlib:org.apache.maven.art
         <filterchain>
           <replacetokens>
             <token key="final.name" value="${final.name}" />
-            <token key="version" value="${version}" />
+            <token key="version" value="${rpm.version}" />
             <token key="package.release" value="${package.release}" />
             <token key="package.build.dir" value="${package.build.dir}" />
             <token key="package.prefix" value="${package.prefix}" />

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=1681418&r1=1681417&r2=1681418&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/contrib/zkpython/build.xml (original)
+++ zookeeper/branches/branch-3.4/src/contrib/zkpython/build.xml Sun May 24 06:37:32 2015
@@ -132,7 +132,7 @@
         <filterchain>
           <replacetokens>
             <token key="final.name" value="${name}" />
-            <token key="version" value="${version}" />
+            <token key="version" value="${rpm.version}" />
             <token key="package.release" value="${package.release}" />
             <token key="package.build.dir" value="${package.build.dir}" />
             <token key="package.prefix" value="${package.prefix}" />