You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2012/02/14 23:31:27 UTC

svn commit: r1244248 - in /incubator/bigtop/branches/RCs/bigtop-packages/src/rpm: oozie/SPECS/oozie.spec pig/SPECS/pig.spec sqoop/SPECS/sqoop.spec

Author: rvs
Date: Tue Feb 14 22:31:27 2012
New Revision: 1244248

URL: http://svn.apache.org/viewvc?rev=1244248&view=rev
Log:
Misc. build fixes

Modified:
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/pig/SPECS/pig.spec
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec?rev=1244248&r1=1244247&r2=1244248&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec Tue Feb 14 22:31:27 2012
@@ -107,7 +107,7 @@ Requires: bigtop-utils
 
 
 %prep
-%setup -n yahoo-oozie-39697f6
+%setup -n %{name}-%{oozie_base_version}
 
 %build
     M2_CACHE=`mktemp -d /tmp/oozie.m2.XXXXX`

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/pig/SPECS/pig.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/pig/SPECS/pig.spec?rev=1244248&r1=1244247&r2=1244248&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/pig/SPECS/pig.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/pig/SPECS/pig.spec Tue Feb 14 22:31:27 2012
@@ -107,7 +107,7 @@ language called Pig Latin, which has the
 
 
 %prep
-%setup -n pig-%{pig_base_version}
+%setup -n %{name}-%{pig_base_version}
 
 %build
 env PIG_BASE_VERSION=%{pig_base_version} bash %{SOURCE1}

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec?rev=1244248&r1=1244247&r2=1244248&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec Tue Feb 14 22:31:27 2012
@@ -19,6 +19,21 @@
 
 %if  %{?suse_version:1}0
 
+# Only tested on openSUSE 11.4. le'ts update it for previous release when confirmed
+%if 0%{suse_version} > 1130
+%define suse_check \# Define an empty suse_check for compatibility with older sles
+%endif
+
+# SLES is more strict anc check all symlinks point to valid path
+# But we do point to a hadoop jar which is not there at build time
+# (but would be at install time).
+# Since our package build system does not handle dependencies,
+# these symlink checks are deactivated
+%define __os_install_post \
+    %{suse_check} ; \
+    /usr/lib/rpm/brp-compress ; \
+    %{nil}
+
 %define doc_sqoop %{_docdir}/sqoop
 %global initd_dir %{_sysconfdir}/rc.d
 %define alternatives_cmd update-alternatives
@@ -83,7 +98,7 @@ Shared metadata repository for Sqoop. Th
 server for Sqoop clients across a network to use.
 
 %prep
-%setup -n sqoop-%{sqoop_base_version}-src
+%setup -n %{name}-%{sqoop_base_version}-src
 
 %build
 bash %{SOURCE1} -Dversion=%{sqoop_base_version}