hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r1149323 - in /hadoop/common/trunk/hdfs: CHANGES.txt src/packages/rpm/spec/hadoop-hdfs.spec
Date Thu, 21 Jul 2011 19:16:11 GMT
Author: omalley
Date: Thu Jul 21 19:16:09 2011
New Revision: 1149323

URL: http://svn.apache.org/viewvc?rev=1149323&view=rev
Log:
HDFS-2156. Make hdfs and mapreduce rpm only depend on the same major 
version for common and hdfs. (eyang via omalley)

Modified:
    hadoop/common/trunk/hdfs/CHANGES.txt
    hadoop/common/trunk/hdfs/src/packages/rpm/spec/hadoop-hdfs.spec

Modified: hadoop/common/trunk/hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hdfs/CHANGES.txt?rev=1149323&r1=1149322&r2=1149323&view=diff
==============================================================================
--- hadoop/common/trunk/hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hdfs/CHANGES.txt Thu Jul 21 19:16:09 2011
@@ -294,6 +294,9 @@ Trunk (unreleased changes)
    
     HDFS-2083. Query JMX statistics over http via JMXJsonServlet. (tanping)
 
+    HDFS-2156. Make hdfs and mapreduce rpm only depend on the same major 
+    version for common and hdfs. (eyang via omalley)
+
   IMPROVEMENTS
 
     HDFS-1875. MiniDFSCluster hard-codes dfs.datanode.address to localhost

Modified: hadoop/common/trunk/hdfs/src/packages/rpm/spec/hadoop-hdfs.spec
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hdfs/src/packages/rpm/spec/hadoop-hdfs.spec?rev=1149323&r1=1149322&r2=1149323&view=diff
==============================================================================
--- hadoop/common/trunk/hdfs/src/packages/rpm/spec/hadoop-hdfs.spec (original)
+++ hadoop/common/trunk/hdfs/src/packages/rpm/spec/hadoop-hdfs.spec Thu Jul 21 19:16:09 2011
@@ -17,9 +17,10 @@
 # RPM Spec file for Hadoop version @version@
 #
 
-%define name         hadoop-hdfs
-%define version      @version@
-%define release      @package.release@
+%define name          hadoop-hdfs
+%define version       @version@
+%define release       @package.release@
+%define major_version %(echo %{version} | cut -d. -f -2)
 
 # Installation Locations
 %define _prefix      @package.prefix@
@@ -75,7 +76,7 @@ Prefix: %{_conf_dir}
 Prefix: %{_log_dir}
 Prefix: %{_pid_dir}
 Buildroot: %{_build_dir}
-Requires: sh-utils, textutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service,
jdk >= 1.6, hadoop-common >= %{version}
+Requires: sh-utils, textutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service,
hadoop-common >= %{major_version}.0, hadoop-common <= %{major_version}.9999
 AutoReqProv: no
 Provides: hadoop-hdfs
 



Mime
View raw message