From 323bc543a7da74a9fd690a6c27bc11c11bf15559 Mon Sep 17 00:00:00 2001 From: gil Date: Jun 02 2016 14:26:24 +0000 Subject: disable hadoop stuff with bcond --- diff --git a/apache-commons-vfs.spec b/apache-commons-vfs.spec index 7a133a5..d001b4d 100644 --- a/apache-commons-vfs.spec +++ b/apache-commons-vfs.spec @@ -1,6 +1,8 @@ +# hadoop was retired +%bcond_with hadoop Name: apache-commons-vfs Version: 2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Commons Virtual File System License: ASL 2.0 Url: http://commons.apache.org/vfs/ @@ -15,6 +17,12 @@ BuildRequires: mvn(commons-net:commons-net) BuildRequires: mvn(javax.ws.rs:jsr311-api) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.ant:ant) +%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:) +BuildRequires: mvn(org.apache.hadoop:hadoop-hdfs::tests:) +%endif BuildRequires: mvn(org.apache.commons:commons-collections4) BuildRequires: mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.commons:commons-lang3) @@ -141,8 +149,10 @@ rm core/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTes %pom_remove_dep -r :sshd-core # hadoop has been retired +%if %{without hadoop} %pom_remove_dep -r org.apache.hadoop rm -r core/src/{main,test}/java/org/apache/commons/vfs2/provider/hdfs +%endif # not really needed %pom_remove_plugin :maven-checkstyle-plugin @@ -186,6 +196,9 @@ install -p -m 644 commons-vfs %{buildroot}%{_sysconfdir}/ant.d/commons-vfs %config %{_sysconfdir}/ant.d/commons-vfs %changelog +* Thu Jun 02 2016 gil cattaneo 2.1-3 +- disable hadoop stuff with bcond + * Thu Jun 02 2016 Michael Simacek - 2.1-2 - Remove support for retired hadoop