incubator-hcatalog-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject svn commit: r1173906 - in /incubator/hcatalog/branches/branch-0.2: CHANGES.txt build.xml
Date Wed, 21 Sep 2011 23:36:43 GMT
Author: hashutosh
Date: Wed Sep 21 23:36:43 2011
New Revision: 1173906

URL: http://svn.apache.org/viewvc?rev=1173906&view=rev
Log:
HCATALOG-113. rpm name not properly reflecting the version number

Modified:
    incubator/hcatalog/branches/branch-0.2/CHANGES.txt
    incubator/hcatalog/branches/branch-0.2/build.xml

Modified: incubator/hcatalog/branches/branch-0.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.2/CHANGES.txt?rev=1173906&r1=1173905&r2=1173906&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.2/CHANGES.txt (original)
+++ incubator/hcatalog/branches/branch-0.2/CHANGES.txt Wed Sep 21 23:36:43 2011
@@ -75,6 +75,8 @@ Release 0.2.0 - Sept-2011
   OPTIMIZATIONS
 
   BUG FIXES
+    HCAT-113. rpm name not properly reflecting the version number (gates via hashutosh)
+
     HCAT-84. Incorrect or missing SVN property settings (sebb via hashutosh)    
 
     HCAT-112. install scripts assumes bash shell but don't set it explictly (hashutosh)

Modified: incubator/hcatalog/branches/branch-0.2/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.2/build.xml?rev=1173906&r1=1173905&r2=1173906&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.2/build.xml (original)
+++ incubator/hcatalog/branches/branch-0.2/build.xml Wed Sep 21 23:36:43 2011
@@ -95,9 +95,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"/>
@@ -669,7 +668,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}" />
@@ -711,7 +710,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}" />



Mime
View raw message