BIGTOP-657. Mahout doc should be in its own package

git-svn-id: https://svn.apache.org/repos/asf/incubator/bigtop/branches/branch-0.4@1371444 13f79535-47bb-0310-9956-ffa450edef68
apache · Aug 9, 2012 · 2299f7b · 2299f7b
1 parent 439ec30
commit 2299f7b
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 10 deletions.
diff --git a/bigtop-packages/src/deb/mahout/control b/bigtop-packages/src/deb/mahout/control
@@ -41,4 +41,11 @@ Description: A set of Java libraries for scalable machine learning.
  diverse community to facilitate discussions not only on the project itself but
  also on potential use cases. Come to the mailing lists to find out more.
 
+Package: mahout-doc
+Provides: mahout-doc
+Architecture: all
+Section: doc
+Description: Documentation for Apache Mahout
+ This package contains the documentation for Apache Mahout
+
 
diff --git a/bigtop-packages/src/deb/mahout/mahout-doc.dirs b/bigtop-packages/src/deb/mahout/mahout-doc.dirs
@@ -0,0 +1 @@
+/usr/share/doc/mahout-doc/
diff --git a/bigtop-packages/src/deb/mahout/mahout-doc.install b/bigtop-packages/src/deb/mahout/mahout-doc.install
@@ -0,0 +1,3 @@
+#DOCS#
+/usr/share/doc/mahout-doc
+
diff --git a/bigtop-packages/src/deb/mahout/mahout.dirs b/bigtop-packages/src/deb/mahout/mahout.dirs
@@ -0,0 +1,3 @@
+/etc/mahout/conf.dist
+/usr/lib/mahout
+/usr/bin
diff --git a/bigtop-packages/src/deb/mahout/mahout.install b/bigtop-packages/src/deb/mahout/mahout.install
@@ -0,0 +1,3 @@
+/etc/mahout/conf.dist
+/usr/lib/mahout
+/usr/bin/mahout
diff --git a/bigtop-packages/src/deb/mahout/rules b/bigtop-packages/src/deb/mahout/rules
@@ -47,11 +47,12 @@ install-indep:
 	dh_testroot
 	sh -x debian/install_mahout.sh \
 	  --build-dir=build \
-          --doc-dir=/usr/share/doc/mahout \
-	  --prefix=debian/mahout
-	rm -rf debian/mahout/usr/lib/mahout/lib/slf4j-log4j12-*.jar debian/mahout/usr/lib/mahout/lib/hadoop
-	ln -fs /usr/lib/hadoop/client debian/mahout/usr/lib/mahout/lib/hadoop
-	dh_install -i
+	  --doc-dir=/usr/share/doc/mahout-doc \
+	  --prefix=debian/tmp/mahout
+	rm -rf debian/tmp/mahout/usr/lib/mahout/lib/slf4j-log4j12-*.jar debian/tmp/mahout/usr/lib/mahout/lib/hadoop
+	ln -fs /usr/lib/hadoop/client debian/tmp/mahout/usr/lib/mahout/lib/hadoop
+	dh_install --sourcedir=debian/tmp/mahout -i
+
 	(dh_lintian) || /bin/true
 
 binary-common:	

diff --git a/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec b/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
@@ -22,10 +22,10 @@
 %define man_dir /usr/share/man
 
 %if  %{?suse_version:1}0
-%define doc_mahout %{_docdir}/mahout
+%define doc_mahout %{_docdir}/mahout-doc
 %define alternatives_cmd update-alternatives
 %else
-%define doc_mahout %{_docdir}/mahout-%{mahout_version}
+%define doc_mahout %{_docdir}/mahout-doc-%{mahout_version}
 %define alternatives_cmd alternatives
 %endif
 
@@ -63,7 +63,15 @@ commercially friendly Apache Software license.
 Scalable community. The goal of Mahout is to build a vibrant, responsive,
 diverse community to facilitate discussions not only on the project itself but
 also on potential use cases. Come to the mailing lists to find out more.
-
+
+
+%package doc
+Summary: Apache Mahout Documentation
+Group: Documentation
+%description doc
+Documentation for Apache Mahout
+
+
 %prep
 %setup -n %{name}-distribution-%{mahout_base_version}
 
@@ -92,9 +100,11 @@ fi
 #######################
 %files 
 %defattr(-,root,root,755)
+%doc LICENSE.txt README.txt NOTICE.txt
 %config(noreplace) %{config_mahout}.dist
-%doc %{doc_mahout}
 %{lib_mahout}
 %{bin_mahout}/mahout
 
-
+%files doc
+%defattr(-,root,root)
+%doc %{doc_mahout}