Author: rvs
Date: Tue Sep 13 22:45:29 2011
New Revision: 1170375
URL: http://svn.apache.org/viewvc?rev=1170375&view=rev
Log:
BIGTOP-91. Docs should be in %{_docdir}/<PACKAGE_NAME>-<PACKAGE_VERSION>
Modified:
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
Modified:
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1170375&r1=1170374&r2=1170375&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Tue
Sep 13 22:45:29 2011
@@ -319,6 +319,7 @@ bash $RPM_SOURCE_DIR/install_hadoop.sh \
--installed-lib-dir=%{lib_hadoop} \
--man-dir=$RPM_BUILD_ROOT%{man_hadoop} \
+%__mv -f $RPM_BUILD_ROOT/usr/share/doc/libhdfs-devel
$RPM_BUILD_ROOT/%{_docdir}/libhdfs-%{hadoop_version}
# Init.d scripts
%__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/
@@ -483,5 +484,4 @@ fi
%{_libdir}/libhdfs*
%{_includedir}/hdfs.h
# -devel should be its own package
-%doc %{_docdir}/libhdfs-devel
-
+%doc %{_docdir}/libhdfs-%{hadoop_version}
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec?rev=1170375&r1=1170374&r2=1170375&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec Tue
Sep 13 22:45:29 2011
@@ -216,7 +216,7 @@ getent passwd hbase 2>&1 > /dev/null ||
%files doc
%defattr(-,root,root)
-%{doc_hbase}/
+%doc %{doc_hbase}/
%define service_macro() \
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec?rev=1170375&r1=1170374&r2=1170375&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec Tue
Sep 13 22:45:29 2011
@@ -151,5 +151,4 @@ chkconfig --del sqoop-metastore
%{_mandir}/man1/sqoop-metastore.1.gz
%{_mandir}/man1/sqoop-version.1.gz
%{_mandir}/man1/sqoop-merge.1.gz
-%{_docdir}/sqoop-%{sqoop_version}
-
+%doc %{doc_sqoop}
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec?rev=1170375&r1=1170374&r2=1170375&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec Tue
Sep 13 22:45:29 2011
@@ -60,6 +60,5 @@ sh $RPM_SOURCE_DIR/install_whirr.sh \
%defattr(-,root,root)
%attr(0755,root,root) %{lib_whirr}
%attr(0755,root,root) %{_bindir}/%{name}
-%attr(0644,root,root) %{man_dir}/man1/whirr.1.gz
+%doc %attr(0644,root,root) %{man_dir}/man1/whirr.1.gz
%ghost %{lib_whirr}/cli/whirr.log
-
