Attachment 881375 Details for Bug 1083135 – fix specfile conditionals for non-fedora system

[patch] fix specfile conditionals for non-fedora system

hadoop-fix_conditionnals.patch (text/plain), 1.90 KB, created by Xavier Bachelot on 2014-04-01 14:27:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xavier Bachelot

Created: 2014-04-01 14:27:26 UTC

Size: 1.90 KB

patch

obsolete

>From 77deefd7700be65de07f7e2789cd02c262509d28 Mon Sep 17 00:00:00 2001
>From: Xavier Bachelot <xavier@bachelot.org>
>Date: Tue, 1 Apr 2014 16:17:52 +0200
>Subject: [PATCH] Allow specfile to evaluate on non-Fedora system
>
>---
> hadoop.spec | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/hadoop.spec b/hadoop.spec
>index a11535d..5b95952 100644
>--- a/hadoop.spec
>+++ b/hadoop.spec
>@@ -162,7 +162,7 @@ BuildRequires: maven-surefire-plugin
> BuildRequires: maven-war-plugin
> BuildRequires: mockito
> BuildRequires: native-maven-plugin
>-%if 0%{fedora} < 21
>+%if 0%{?fedora} < 21
> BuildRequires: netty
> %else
> BuildRequires: netty3
>@@ -186,7 +186,7 @@ BuildRequires: txw2
> BuildRequires: which
> BuildRequires: xmlenc
> BuildRequires: znerd-oss-parent
>-%if 0%{fedora} < 21
>+%if 0%{?fedora} < 21
> BuildRequires: zookeeper-java
> %else
> BuildRequires: zookeeper-java > 3.4.5-15
>@@ -476,12 +476,12 @@ This package contains files needed to run Apache Hadoop YARN in secure mode.
> %if %{package_libhdfs}
> %patch5 -p1
> %endif
>-%if 0%{fedora} >= 21
>+%if 0%{?fedora} >= 21
> %patch6 -p1
> %patch7 -p1
> %endif
> 
>-%if 0%{fedora} < 21
>+%if 0%{?fedora} < 21
> # The hadoop test suite needs classes from the zookeeper test suite.
> # We need to modify the deps to use the pom for the zookeeper-test jar
> %pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='zookeeper' and pom:scope='test']/pom:artifactId" zookeeper-test hadoop-common-project/hadoop-common
>@@ -577,7 +577,7 @@ This package contains files needed to run Apache Hadoop YARN in secure mode.
> %mvn_package :%{name}-yarn*::{}: %{name}-yarn
> 
> # Jar files that need to be overridden due to installation location
>-%if 0%{fedora} < 21
>+%if 0%{?fedora} < 21
> # Workaround for bz1023116
> #%%mvn_file :%{name}-common::{}: %{_jnidir}/%{name}-common %{_datadir}/%{name}/common/%{name}-common
> %mvn_file :%{name}-common::{}: %{_jnidir}/%{name}/%{name}-common
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1083135: 881375