Author: bmahe
Date: Wed Jun 27 20:06:04 2012
New Revision: 1354702
URL: http://svn.apache.org/viewvc?rev=1354702&view=rev
Log:
BIGTOP-657. Mahout doc should be in its own package
Added:
incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout-doc.dirs
incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout-doc.install
incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout.dirs
incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout.install
Modified:
incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/control
incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules
incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/control
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/control?rev=1354702&r1=1354701&r2=1354702&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/control Wed Jun 27
20:06:04 2012
@@ -41,4 +41,11 @@ Description: A set of Java libraries for
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
+
Added: incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout-doc.dirs
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout-doc.dirs?rev=1354702&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout-doc.dirs
(added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout-doc.dirs Wed
Jun 27 20:06:04 2012
@@ -0,0 +1 @@
+/usr/share/doc/mahout-doc/
Added: incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout-doc.install
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout-doc.install?rev=1354702&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout-doc.install
(added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout-doc.install
Wed Jun 27 20:06:04 2012
@@ -0,0 +1,3 @@
+#DOCS#
+/usr/share/doc/mahout-doc
+
Added: incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout.dirs
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout.dirs?rev=1354702&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout.dirs (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout.dirs Wed Jun
27 20:06:04 2012
@@ -0,0 +1,3 @@
+/etc/mahout/conf.dist
+/usr/lib/mahout
+/usr/bin
Added: incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout.install
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout.install?rev=1354702&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout.install (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout.install Wed
Jun 27 20:06:04 2012
@@ -0,0 +1,3 @@
+/etc/mahout/conf.dist
+/usr/lib/mahout
+/usr/bin/mahout
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules?rev=1354702&r1=1354701&r2=1354702&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules Wed Jun 27
20:06:04 2012
@@ -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:
Modified:
incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec?rev=1354702&r1=1354701&r2=1354702&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec Wed
Jun 27 20:06:04 2012
@@ -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 li
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}
