Author: hashutosh
Date: Fri Sep 30 20:55:37 2011
New Revision: 1177828
URL: http://svn.apache.org/viewvc?rev=1177828&view=rev
Log:
rpm name not properly reflecting the version number
Modified:
incubator/hcatalog/trunk/CHANGES.txt
incubator/hcatalog/trunk/build.xml
Modified: incubator/hcatalog/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1177828&r1=1177827&r2=1177828&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Fri Sep 30 20:55:37 2011
@@ -51,6 +51,8 @@ Trunk (unreleased changes)
OPTIMIZATIONS
BUG FIXES
+ HCAT-113. rpm name not properly reflecting the version number (gates via
hashutosh)
+
HCAT-112. install scripts assumes bash shell but don't set it explictly
(hashutosh)
HCAT-100. Change references of hcat.sh to hcat in test harness (hashutosh)
Modified: incubator/hcatalog/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build.xml?rev=1177828&r1=1177827&r2=1177828&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build.xml (original)
+++ incubator/hcatalog/trunk/build.xml Fri Sep 30 20:55:37 2011
@@ -96,9 +96,8 @@
<property name="package.pid.dir" value="/var/run/hcatalog"/>
<property name="package.var.dir" value="/var/lib/hcatalog"/>
<property name="package.share.dir" value="/share/hcatalog/${module}"/>
- <!-- Use fixed path to build rpm for avoiding rpmbuild conflict with dash
path names -->
- <property name="package.buildroot"
value="/tmp/hcatalog_package_build_${user.name}"/>
- <property name="package.build.dir"
value="/tmp/hcatalog_package_build_${user.name}/BUILD"/>
+ <property name="package.buildroot"
value="${build.dir}/rpm/hcatalog_package_build_${user.name}"/>
+ <property name="package.build.dir"
value="${build.dir}/rpm/hcatalog_package_build_${user.name}/BUILD"/>
<!-- rats properties -->
<property name="rat.reporting.classname" value="rat.Report"/>
@@ -670,7 +669,7 @@
<filterchain>
<replacetokens>
<token key="final.name" value="${final.name}" />
- <token key="version" value="${_version}" />
+ <token key="version" value="${hcatalog.version}" />
<token key="package.release" value="${package.release}" />
<token key="package.build.dir"
value="${package.build.dir}" />
<token key="package.prefix" value="${package.prefix}" />
@@ -712,7 +711,7 @@
<filterchain>
<replacetokens>
<token key="final.name" value="${final.name}" />
- <token key="version" value="${_version}" />
+ <token key="version" value="${hcatalog.version}" />
<token key="package.release" value="${package.release}" />
<token key="package.build.dir"
value="${package.build.dir}" />
<token key="package.prefix" value="${package.prefix}" />
