浏览代码

HADOOP-7459. Remove jdk-1.6.0 dependency check from rpm. (omalley)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-204@1147228 13f79535-47bb-0310-9956-ffa450edef68
Owen O'Malley 14 年之前
父节点
当前提交
0de8272549
共有 2 个文件被更改,包括 3 次插入1 次删除
  1. 2 0
      CHANGES.txt
  2. 1 1
      src/packages/rpm/spec/hadoop.spec

+ 2 - 0
CHANGES.txt

@@ -162,6 +162,8 @@ Release 0.20.204.0 - unreleased
 
 
     MAPREDUCE-1251. c++ utils doesn't compile. (Eli Collins via shv)
     MAPREDUCE-1251. c++ utils doesn't compile. (Eli Collins via shv)
 
 
+    HADOOP-7459. Remove jdk-1.6.0 dependency check from rpm. (omalley)
+
 Release 0.20.203.1 - Unreleased
 Release 0.20.203.1 - Unreleased
 
 
     HADOOP-7330. Fix MetricsSourceAdapter to use the value instead of the 
     HADOOP-7330. Fix MetricsSourceAdapter to use the value instead of the 

+ 1 - 1
src/packages/rpm/spec/hadoop.spec

@@ -78,7 +78,7 @@ Prefix: %{_conf_dir}
 Prefix: %{_log_dir}
 Prefix: %{_log_dir}
 Prefix: %{_pid_dir}
 Prefix: %{_pid_dir}
 Buildroot: %{_build_dir}
 Buildroot: %{_build_dir}
-Requires: sh-utils, textutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service, jdk >= 1.6
+Requires: sh-utils, textutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service
 AutoReqProv: no
 AutoReqProv: no
 Provides: hadoop
 Provides: hadoop