incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1187090 - in /incubator/bigtop/trunk/bigtop-packages/src/rpm: flume/SPECS/ hadoop/SPECS/ hbase/SPECS/ hive/SPECS/ oozie/SPECS/ pig/SPECS/ sqoop/SPECS/ zookeeper/SPECS/
Date Thu, 20 Oct 2011 22:05:47 GMT
Author: rvs
Date: Thu Oct 20 22:05:47 2011
New Revision: 1187090

URL: http://svn.apache.org/viewvc?rev=1187090&view=rev
Log:
BIGTOP-124. documentation on SLES is not supposed to have package version embedded in the
directory name

Modified:
    incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec
    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/hive/SPECS/hive.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec?rev=1187090&r1=1187089&r2=1187090&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec Thu Oct 20 22:05:47
2011
@@ -14,7 +14,6 @@
 # limitations under the License.
 %define etc_flume /etc/flume/conf
 %define bin_flume %{_bindir}
-%define doc_flume %{_docdir}/flume-%{flume_version}
 %define man_flume %{_mandir}
 %define lib_flume /usr/lib/flume
 %define log_flume /var/log/flume
@@ -37,11 +36,13 @@
     /usr/lib/rpm/brp-compress ; \
     %{nil}
 
+%define doc_flume %{_docdir}/flume
 %define alternatives_cmd update-alternatives
 %global initd_dir %{_sysconfdir}/rc.d
 
 %else
 
+%define doc_flume %{_docdir}/flume-%{flume_version}
 %define alternatives_cmd alternatives
 %global initd_dir %{_sysconfdir}/rc.d/init.d
 

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=1187090&r1=1187089&r2=1187090&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 Thu Oct 20 22:05:47
2011
@@ -30,7 +30,6 @@
 %define log_hadoop %{log_hadoop_dirname}/%{name}
 %define bin_hadoop %{_bindir}
 %define man_hadoop %{_mandir}
-%define doc_hadoop %{_docdir}/%{name}-%{hadoop_version}
 %define src_hadoop /usr/src/%{name}
 %define hadoop_username mapred
 %define hadoop_services namenode secondarynamenode datanode jobtracker tasktracker
@@ -60,6 +59,7 @@
     /usr/lib/rpm/brp-python-bytecompile ; \
     %{nil}
 
+%define doc_hadoop %{_docdir}/%{name}-%{hadoop_version}
 %define alternatives_cmd alternatives
 %global initd_dir %{_sysconfdir}/rc.d/init.d
 %endif
@@ -78,11 +78,13 @@
     /usr/lib/rpm/brp-compress ; \
     %{nil}
 
+%define doc_hadoop %{_docdir}/%{name}
 %define alternatives_cmd update-alternatives
 %global initd_dir %{_sysconfdir}/rc.d
 %endif
 
 %if  0%{?mgaversion}
+%define doc_hadoop %{_docdir}/%{name}-%{hadoop_version}
 %define alternatives_cmd update-alternatives
 %global initd_dir %{_sysconfdir}/rc.d/init.d
 %endif

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=1187090&r1=1187089&r2=1187090&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 Thu Oct 20 22:05:47
2011
@@ -20,7 +20,6 @@
 %define logs_hbase %{hbase_home}/logs
 %define pids_hbase %{hbase_home}/pids
 %define webapps_hbase %{hbase_home}/hbase-webapps
-%define doc_hbase %{_docdir}/hbase-%{hbase_version}
 %define man_dir %{_mandir}
 %define hbase_username hbase
 %define hbase_services master regionserver thrift
@@ -42,11 +41,12 @@
     /usr/lib/rpm/brp-compress ; \
     %{nil}
 
-
+%define doc_hbase %{_docdir}/hbase
 %global initd_dir %{_sysconfdir}/rc.d
 
 %else
 
+%define doc_hbase %{_docdir}/hbase-%{hbase_version}
 %global initd_dir %{_sysconfdir}/rc.d/init.d
 
 %endif

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec?rev=1187090&r1=1187089&r2=1187090&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec Thu Oct 20 22:05:47
2011
@@ -19,7 +19,6 @@
 %define var_lib_hive /var/lib/hive
 %define bin_hive /usr/bin
 %define hive_config_virtual hive_active_configuration
-%define doc_hive %{_docdir}/hive-%{hive_version}
 %define man_dir %{_mandir}
 %define hive_services server metastore
 # After we run "ant package" we'll find the distribution here
@@ -27,6 +26,7 @@
 
 %if  %{!?suse_version:1}0
 
+%define doc_hive %{_docdir}/hive-%{hive_version}
 %define alternatives_cmd alternatives
 
 %global initd_dir %{_sysconfdir}/rc.d/init.d
@@ -38,6 +38,7 @@
 %define suse_check \# Define an empty suse_check for compatibility with older sles
 %endif
 
+%define doc_hive %{_docdir}/hive
 %define alternatives_cmd update-alternatives
 
 %global initd_dir %{_sysconfdir}/rc.d

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec?rev=1187090&r1=1187089&r2=1187090&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec Thu Oct 20 22:05:47
2011
@@ -19,8 +19,10 @@
 %define data_oozie /var/lib/oozie
 
 %if  %{!?suse_version:1}0
+  %define doc_oozie %{_docdir}/oozie-%{package_version}
   %define initd_dir %{_sysconfdir}/rc.d/init.d
 %else
+  %define doc_oozie %{_docdir}/oozie
   %define initd_dir %{_sysconfdir}/rc.d
 %endif
 
@@ -111,7 +113,7 @@ BuildArch: noarch
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
-    sh %{SOURCE2} --extra-dir=$RPM_SOURCE_DIR --build-dir=. --server-dir=$RPM_BUILD_ROOT
--client-dir=$RPM_BUILD_ROOT --docs-dir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} --initd-dir=$RPM_BUILD_ROOT%{initd_dir}
+    sh %{SOURCE2} --extra-dir=$RPM_SOURCE_DIR --build-dir=. --server-dir=$RPM_BUILD_ROOT
--client-dir=$RPM_BUILD_ROOT --docs-dir=$RPM_BUILD_ROOT%{doc_oozie} --initd-dir=$RPM_BUILD_ROOT%{initd_dir}
 
 %__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
 
@@ -163,7 +165,5 @@ fi
 %{lib_oozie}/bin/oozie
 %{lib_oozie}/bin/oozie-examples.sh
 %{lib_oozie}/lib
-%{_docdir}
-%docdir %{_docdir}
+%doc %{doc_oozie}
 %{man_dir}/man1/oozie.1.*
-

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec?rev=1187090&r1=1187089&r2=1187090&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec Thu Oct 20 22:05:47
2011
@@ -19,7 +19,6 @@
 %define log_pig /var/log/%{pig_name}
 %define bin_pig /usr/bin
 %define pig_config_virtual pig_active_configuration
-%define doc_pig %{_docdir}/pig-%{pig_version}
 %define man_dir %{_mandir}
 
 # CentOS 5 does not have any dist macro
@@ -38,6 +37,7 @@
     /usr/lib/rpm/brp-python-bytecompile ; \
     %{nil}
 
+%define doc_pig %{_docdir}/pig-%{pig_version}
 %define alternatives_cmd alternatives
 
 %endif
@@ -50,6 +50,7 @@
 %define suse_check \# Define an empty suse_check for compatibility with older sles
 %endif
 
+%define doc_pig %{_docdir}/pig
 %define alternatives_cmd update-alternatives
 %define __os_install_post \
     %{suse_check} ; \
@@ -60,6 +61,7 @@
 
 
 %if  0%{?mgaversion}
+%define doc_pig %{_docdir}/pig-%{pig_version}
 %define alternatives_cmd update-alternatives
 %endif
 

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=1187090&r1=1187089&r2=1187090&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 Thu Oct 20 22:05:47
2011
@@ -12,16 +12,17 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-%define doc_sqoop %{_docdir}/sqoop-%{sqoop_version}
 %define lib_sqoop /usr/lib/sqoop
 
 
 %if  %{?suse_version:1}0
 
+%define doc_sqoop %{_docdir}/sqoop
 %global initd_dir %{_sysconfdir}/rc.d
 
 %else
 
+%define doc_sqoop %{_docdir}/sqoop-%{sqoop_version}
 %global initd_dir %{_sysconfdir}/rc.d/init.d
 
 %endif

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec?rev=1187090&r1=1187089&r2=1187090&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec Thu Oct
20 22:05:47 2011
@@ -14,7 +14,6 @@
 # limitations under the License.
 %define etc_zookeeper /etc/zookeeper
 %define bin_zookeeper %{_bindir}
-%define doc_zookeeper %{_docdir}/zookeeper-%{zookeeper_version}
 %define lib_zookeeper /usr/lib/zookeeper
 %define log_zookeeper /var/log/zookeeper
 %define run_zookeeper /var/run/zookeeper
@@ -38,6 +37,7 @@
     %{nil}
 
 
+%define doc_zookeeper %{_docdir}/zookeeper
 %define alternatives_cmd update-alternatives
 %define alternatives_dep update-alternatives
 %define chkconfig_dep    aaa_base
@@ -46,6 +46,7 @@
 
 %else
 
+%define doc_zookeeper %{_docdir}/zookeeper-%{zookeeper_version}
 %define alternatives_cmd alternatives
 %define alternatives_dep chkconfig 
 %define chkconfig_dep    chkconfig



Mime
View raw message