From 3045b270cbc4b5b036b43188f700553b51a447c3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Jan 29 2017 19:03:15 +0000 Subject: Fix hadoop build conditionals --- diff --git a/apache-commons-vfs.spec b/apache-commons-vfs.spec index 80349e5..53d2a7d 100644 --- a/apache-commons-vfs.spec +++ b/apache-commons-vfs.spec @@ -1,8 +1,8 @@ # hadoop was retired -%bcond_with hadoop +%bcond_without hadoop Name: apache-commons-vfs Version: 2.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Commons Virtual File System License: ASL 2.0 Url: http://commons.apache.org/vfs/ @@ -17,7 +17,7 @@ BuildRequires: mvn(commons-net:commons-net) BuildRequires: mvn(javax.ws.rs:jsr311-api) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.ant:ant) -%if %{without hadoop} +%if %{with hadoop} BuildRequires: mvn(org.apache.hadoop:hadoop-common) BuildRequires: mvn(org.apache.hadoop:hadoop-hdfs) BuildRequires: mvn(org.apache.hadoop:hadoop-common::tests:) @@ -155,7 +155,7 @@ rm core/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTes %pom_remove_dep -r :sshd-core # hadoop has been retired -%if %{with hadoop} +%if %{without hadoop} %pom_remove_dep -r org.apache.hadoop rm -r core/src/{main,test}/java/org/apache/commons/vfs2/provider/hdfs %endif @@ -206,6 +206,9 @@ install -p -m 644 commons-vfs %{buildroot}%{_sysconfdir}/ant.d/commons-vfs %config %{_sysconfdir}/ant.d/commons-vfs %changelog +* Sun Jan 29 2017 Mikolaj Izdebski - 2.1-8 +- Fix hadoop build conditionals + * Fri Oct 28 2016 gil cattaneo 2.1-7 - enable HDFS support (rhbz#1387108)