From fb221fa3261bd9ec5d824e2bb1c2b4c99fb86841 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 04 2015 07:11:29 +0000
Subject: import devtoolset-3-tika-1.4-6.el7


---

diff --git a/SPECS/tika.spec b/SPECS/tika.spec
index 5b440af..6800480 100644
--- a/SPECS/tika.spec
+++ b/SPECS/tika.spec
@@ -6,11 +6,11 @@
 
 %{?scl:%scl_package tika}
 %{!?scl:%global pkg_name %{name}}
-%{!?maven_scl:%global maven_scl_prefix  %{nil}}
+%{?java_common_find_provides_and_requires}
 
 Name:          %{?scl_prefix}tika
 Version:       1.4
-Release:       5%{?dist}
+Release:       6%{?dist}
 Summary:       A content analysis toolkit
 License:       ASL 2.0
 Url:           http://tika.apache.org/
@@ -26,27 +26,25 @@ Source0:       %{pkg_name}-%{version}-minimal.zip
 Patch0:        %{pkg_name}-1.4-fix-build-deps.patch
 Patch1:        %{pkg_name}-1.4-add-apache-commons-logging_dep.patch
 
-BuildRequires: java-devel
-
-BuildRequires: %{maven_scl_prefix}aqute-bndlib
-BuildRequires: ant
-BuildRequires: %{maven_scl_prefix}felix-osgi-compendium
-BuildRequires: %{maven_scl_prefix}felix-osgi-core
+BuildRequires: %{?scl_prefix_maven}aqute-bndlib
+BuildRequires: %{?scl_prefix_java_common}ant
+BuildRequires: %{?scl_prefix_maven}felix-osgi-compendium
+BuildRequires: %{?scl_prefix_maven}felix-osgi-core
 
 %if %{without tika_parsers}
-BuildRequires: apache-commons-logging 
+BuildRequires: %{?scl_prefix_java_common}apache-commons-logging
 %endif
 
 # Test deps
-BuildRequires: %{maven_scl_prefix}junit
+BuildRequires: %{?scl_prefix_java_common}junit
 BuildRequires: %{?scl_prefix}mockito
-BuildRequires: %{maven_scl_prefix}slf4j
+BuildRequires: %{?scl_prefix_java_common}slf4j
 
-BuildRequires: %{maven_scl_prefix}maven-local
-BuildRequires: %{maven_scl_prefix}maven-failsafe-plugin
-BuildRequires: %{maven_scl_prefix}maven-plugin-bundle
-BuildRequires: %{maven_scl_prefix}maven-remote-resources-plugin
-BuildRequires: %{maven_scl_prefix}maven-site-plugin
+BuildRequires: %{?scl_prefix_java_common}maven-local
+BuildRequires: %{?scl_prefix_maven}maven-failsafe-plugin
+BuildRequires: %{?scl_prefix_maven}maven-plugin-bundle
+BuildRequires: %{?scl_prefix_maven}maven-remote-resources-plugin
+BuildRequires: %{?scl_prefix_maven}maven-site-plugin
 
 BuildArch:     noarch
 
@@ -104,6 +102,7 @@ find . -name '*.zip' -delete
 %patch0 -p1
 %patch1 -p1
 
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 %pom_disable_module %{pkg_name}-app
 %pom_disable_module %{pkg_name}-bundle
 %pom_disable_module %{pkg_name}-server
@@ -171,22 +170,23 @@ rm -r %{pkg_name}-parsers/src/test/java/org/apache/tika/parser/microsoft/Project
 %pom_remove_dep org.bouncycastle:bcprov-jdk16 %{pkg_name}-parsers
 %pom_remove_dep org.ow2.asm:asm-all %{pkg_name}-parsers
 %pom_remove_dep org.slf4j:slf4j-log4j12 %{pkg_name}-parsers
+%{?scl:EOF}
 
 %build
 # skip tests for now because there are test failures:
 # Tests which use cglib fail because of incompatibility with asm4
 # Test fails for unavailable build deps: com.googlecode.mp4parser:isoparser
-scl enable %{scl} - <<"EOF"
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 %mvn_package :%{pkg_name} %{pkg_name}
 %mvn_package :%{pkg_name}-core %{pkg_name}
 %mvn_package :%{pkg_name}-parent %{pkg_name}
 %mvn_build -f -s -- -Dproject.build.sourceEncoding=UTF-8
-EOF
+%{?scl:EOF}
 
 %install
-scl enable %{scl} - <<"EOF"
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 %mvn_install
-EOF
+%{?scl:EOF}
 
 %files -f .mfiles-%{pkg_name}
 %dir %{_javadir}/%{pkg_name}
@@ -204,6 +204,9 @@ EOF
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Mon May 11 2015 Mat Booth <mat.booth@redhat.com> - 1.4-6
+- Resolves: rhbz#1219013 - Fails to build from source
+
 * Thu May 29 2014 Sami Wagiaalla <swagiaal@redhat.com> - 1.4-5
 - Scl-ize and build for DTS 3.0.
 - Import package from rawhide.