packages: hadoop/hadoop.spec - implicit packaging

[glen]

Author: glen                         Date: Sun Jan 17 22:00:46 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- implicit packaging

---- Files affected:
packages/hadoop:
   hadoop.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/hadoop/hadoop.spec
diff -u packages/hadoop/hadoop.spec:1.1 packages/hadoop/hadoop.spec:1.2
--- packages/hadoop/hadoop.spec:1.1	Sun Jan 17 22:42:50 2010
+++ packages/hadoop/hadoop.spec	Sun Jan 17 23:00:40 2010
@@ -8,10 +8,10 @@
 Name:		hadoop
 Version:	0.20.1
 Release:	0.1
-License:	ASL 2.0
+License:	Apache v2.0
 Group:		Daemons
 URL:		http://hadoop.apache.org/common/
-Source0:	http://www.apache.org/dist/hadoop/core/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source0:	http://www.apache.org/dist/hadoop/core/%{name}-%{version}/hadoop-%{version}.tar.gz
 # Source0-md5:	719e169b7760c168441b49f405855b72
 BuildRequires:	rpmbuild(macros) >= 1.202
 Requires(postun):	/usr/sbin/groupdel
@@ -20,12 +20,14 @@
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires:	jdk
+Requires:	jre
 Provides:	group(hadoop)
 Provides:	user(hadoop)
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_appdir		%{_datadir}/%{name}
+
 %description
 Apache Hadoop Core is a software platform that lets one easily write
 and run applications that process vast amounts of data.
@@ -62,35 +64,53 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_prefix}/local/%{name}
+install -d $RPM_BUILD_ROOT{%{_appdir},%{_var}/{log,run}/hadoop}
 for D in $(find . -mindepth 1 -maxdepth 1 -type d | cut -c 3- | %{__grep} -Evw 'build|docs|src'); do
-	%{__cp} -a $D $RPM_BUILD_ROOT%{_prefix}/local/%{name}/
+	%{__cp} -a $D $RPM_BUILD_ROOT%{_appdir}/
 done
-install *.jar $RPM_BUILD_ROOT%{_prefix}/local/%{name}/
-install *.txt $RPM_BUILD_ROOT%{_prefix}/local/%{name}/
-install *.xml $RPM_BUILD_ROOT%{_prefix}/local/%{name}/
-install -d $RPM_BUILD_ROOT%{_var}/run/hadoop
-install -d $RPM_BUILD_ROOT%{_var}/log/hadoop
-
-# Packing list
-(	cd $RPM_BUILD_ROOT
-	echo '%defattr(-,root,root,-)'
-	echo '%attr(0755,hadoop,hadoop) %{_var}/run/hadoop'
-	echo '%attr(0755,hadoop,hadoop) %{_var}/log/hadoop'
-	find $RPM_BUILD_ROOT%{_prefix}/local/%{name} -type d -printf '%%%dir %p\n' | %{__sed} -e 's|$RPM_BUILD_ROOT||g'
-	find $RPM_BUILD_ROOT%{_prefix}/local/%{name} -type f -printf '%p\n' | %{__grep} -v 'conf/' | %{__sed} -e 's|$RPM_BUILD_ROOT||g'
-	find $RPM_BUILD_ROOT%{_prefix}/local/%{name}/conf -type f -printf '%%%config(noreplace) %p\n' | %{__sed} -e 's|$RPM_BUILD_ROOT||g'
-) > filelist
+cp -a *.jar *.xml $RPM_BUILD_ROOT%{_appdir}
+
+# we're noarch
+rm -rvf $RPM_BUILD_ROOT%{_appdir}/lib/native/
+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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-%groupadd -r hadoop
-%useradd -m -r -g hadoop -c 'HDFS Runtime User' -s /bin/sh hadoop
+%groupadd -g 245 -r hadoop
+%useradd -u 245 -m -r -g hadoop -c 'HDFS Runtime User' -s /bin/sh hadoop
+
+%postun
+if [ "$1" = "0" ]; then
+	%userremove hadoop
+	%groupremove hadoop
+fi
 
-%files -f filelist
+%files
 %defattr(644,root,root,755)
+%doc CHANGES.txt NOTICE.txt README.txt
+%dir %{_appdir}
+%dir %{_appdir}/bin
+%attr(755,root,root) %{_appdir}/bin/*
+%dir %{_appdir}/conf
+%config(noreplace) %verify(not md5 mtime size) %{_appdir}/conf/*
+%{_appdir}/webapps
+
+%{_appdir}/hadoop-*.jar
+%{_appdir}/ivy
+%{_appdir}/ivy.xml
+%dir %{_appdir}/lib
+%{_appdir}/lib/jdiff
+%{_appdir}/lib/*.jar
+%{_appdir}/lib/jsp-2.1
+
+%{_appdir}/contrib
+
+%attr(775,root,hadoop) %{_var}/run/hadoop
+%attr(775,root,hadoop) %{_var}/log/hadoop
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -98,5 +118,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2010/01/17 22:00:40  glen
+- implicit packaging
+
 Revision 1.1  2010/01/17 21:42:50  glen
 - initial from http://github.com/stockrt/hadoop-spec/raw/master/hadoop.spec
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hadoop/hadoop.spec?r1=1.1&r2=1.2&f=u