Author: glen Date: Sun May 23 17:35:30 2010 GMT Module: packages Tag: HEAD ---- Log message: - save old (jan 18)
---- Files affected: packages/hadoop: hadoop.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: packages/hadoop/hadoop.spec diff -u packages/hadoop/hadoop.spec:1.3 packages/hadoop/hadoop.spec:1.4 --- packages/hadoop/hadoop.spec:1.3 Sun Jan 17 23:17:18 2010 +++ packages/hadoop/hadoop.spec Sun May 23 19:35:24 2010 @@ -1,6 +1,7 @@ # $Revision$, $Date$ # TODO # - hadoop-fuse? +# - hadoop-native.spec? # - pick snippets from http://issues.apache.org/jira/browse/HADOOP-5615 # - http://issues.apache.org/jira/browse/HADOOP-6255 # - https://wiki.ubuntu.com/HadoopPackagingSpec @@ -13,6 +14,8 @@ URL: http://hadoop.apache.org/common/ Source0: http://www.apache.org/dist/hadoop/core/%{name}-%{version}/hadoop-%{version}.tar.gz # Source0-md5: 719e169b7760c168441b49f405855b72 +BuildRequires: jdk +BuildRequires: jpackage-utils BuildRequires: rpmbuild(macros) >= 1.202 Requires(postun): /usr/sbin/groupdel Requires(postun): /usr/sbin/userdel @@ -20,6 +23,7 @@ Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd +Requires: jpackage-utils Requires: jre Provides: group(hadoop) Provides: user(hadoop) @@ -54,17 +58,26 @@ # hadoop-env.sh defaults %{__sed} -i -e ' -s|.*JAVA_HOME=.*|export JAVA_HOME=%{_prefix}/java/latest| + # set JAVA_HOME from jpackage-utils + s|.*JAVA_HOME=.*|. %{_javadir}-utils/java-functions; set_jvm| s|.*HADOOP_CLASSPATH=.*|export HADOOP_CLASSPATH=$HADOOP_CONF_DIR:$(build-classpath hadoop)| s|.*HADOOP_LOG_DIR=.*|export HADOOP_LOG_DIR=%{_var}/log/hadoop| s|.*HADOOP_PID_DIR=.*|export HADOOP_PID_DIR=%{_var}/run/hadoop| ' conf/hadoop-env.sh %build +%ant package \ + -Dversion=%{version} \ +%if %{with apidocs} + -Djava5.home=%{java_home} \ + -Dforrest.home=../apache-forrest-0.8 +%else +%endif %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_appdir},%{_var}/{log,run}/hadoop} +%if 0 cp -a bin c++ conf ivy lib webapps $RPM_BUILD_ROOT%{_appdir} cp -a *.jar *.xml $RPM_BUILD_ROOT%{_appdir} @@ -73,6 +86,7 @@ rm -rvf $RPM_BUILD_ROOT%{_appdir}/c++/Linux-amd64-64 rm -rvf $RPM_BUILD_ROOT%{_appdir}/c++/Linux-i386-32 rm -rvf $RPM_BUILD_ROOT%{_appdir}/librecordio/librecordio.a +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -114,6 +128,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.4 2010/05/23 17:35:24 glen +- save old (jan 18) + Revision 1.3 2010/01/17 22:17:18 glen - no packaging of contrib ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hadoop/hadoop.spec?r1=1.3&r2=1.4&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
