Author: rvs
Date: Tue Dec 6 21:35:42 2011
New Revision: 1211177
URL: http://svn.apache.org/viewvc?rev=1211177&view=rev
Log:
BIGTOP-294. brp-repack-jars chokes on guice-2.0.jar because of the directories
without any read permission
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/pig/SPECS/pig.spec
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1211177&r1=1211176&r2=1211177&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Tue Dec 6 21:35:42 2011
@@ -51,11 +51,11 @@
# So I will suppose anything that is not Mageia or a SUSE will be a
RHEL/CentOS/Fedora
%if %{!?suse_version:1}0 && %{!?mgaversion:1}0
-# brp-repack-jars uses unzip to expand jar files
+# FIXME: brp-repack-jars uses unzip to expand jar files
# Unfortunately aspectjtools-1.6.5.jar pulled by ivy contains some files and
directories without any read permission
# and make whole process to fail.
# So for now brp-repack-jars is being deactivated until this is fixed.
-# See CDH-2151
+# See BIGTOP-294
%define __os_install_post \
/usr/lib/rpm/redhat/brp-compress ; \
/usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} ; \
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec?rev=1211177&r1=1211176&r2=1211177&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
Tue Dec 6 21:35:42 2011
@@ -46,6 +46,24 @@
%else
+# CentOS 5 does not have any dist macro
+# So I will suppose anything that is not Mageia or a SUSE will be a
RHEL/CentOS/Fedora
+%if %{!?mgaversion:1}0
+
+# FIXME: brp-repack-jars uses unzip to expand jar files
+# Unfortunately guice-2.0.jar pulled by ivy contains some files and
directories without any read permission
+# and make whole process to fail.
+# So for now brp-repack-jars is being deactivated until this is fixed.
+# See BIGTOP-294
+%define __os_install_post \
+ /usr/lib/rpm/redhat/brp-compress ; \
+ /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} ; \
+ /usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} ; \
+ /usr/lib/rpm/brp-python-bytecompile ; \
+ %{nil}
+%endif
+
+
%define doc_hbase %{_docdir}/hbase-%{hbase_version}
%global initd_dir %{_sysconfdir}/rc.d/init.d
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/pig/SPECS/pig.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/pig/SPECS/pig.spec?rev=1211177&r1=1211176&r2=1211177&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/pig/SPECS/pig.spec
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/pig/SPECS/pig.spec
Tue Dec 6 21:35:42 2011
@@ -25,11 +25,11 @@
# So I will suppose anything that is not Mageia or a SUSE will be a
RHEL/CentOS/Fedora
%if %{!?suse_version:1}0 && %{!?mgaversion:1}0
-# brp-repack-jars uses unzip to expand jar files
+# FIXME: brp-repack-jars uses unzip to expand jar files
# Unfortunately aspectjtools-1.6.5.jar pulled by ivy contains some files and
directories without any read permission
# and make whole process to fail.
# So for now brp-repack-jars is being deactivated until this is fixed.
-# See CDH-2151
+# See BIGTOP-294
%define __os_install_post \
/usr/lib/rpm/redhat/brp-compress ; \
/usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} ; \
