From 8a0c48c820e2a020cc870d7005e392f4c4432b84 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 04 2015 07:10:45 +0000
Subject: import devtoolset-3-apache-commons-el-1.0-31.el7


---

diff --git a/SPECS/apache-commons-el.spec b/SPECS/apache-commons-el.spec
index a4b073c..ca554ba 100644
--- a/SPECS/apache-commons-el.spec
+++ b/SPECS/apache-commons-el.spec
@@ -5,10 +5,11 @@
 
 %{?scl:%scl_package apache-commons-el}
 %{!?scl:%global pkg_name %{name}}
+%{?java_common_find_provides_and_requires}
 
 Name:          %{?scl_prefix}apache-%{short_name}
 Version:        1.0
-Release:        30%{?dist}
+Release:        31%{?dist}
 Summary:        The Apache Commons Extension Language
 License:        ASL 1.1
 URL:            http://commons.apache.org/%{base_name}
@@ -18,10 +19,10 @@ Source1:        http://repo1.maven.org/maven2/%{short_name}/%{short_name}/%{vers
 Patch0:         %{short_name}-%{version}-license.patch
 Patch1:         %{short_name}-eclipse-manifest.patch
 Patch2:         %{short_name}-enum.patch
-BuildRequires:  ant
-BuildRequires:  tomcat-jsp-2.2-api
-BuildRequires:  tomcat-servlet-3.0-api
-BuildRequires:  junit
+BuildRequires:  %{?scl_prefix_java_common}ant
+BuildRequires:  %{?scl_prefix_java_common}tomcat-jsp-2.2-api
+BuildRequires:  %{?scl_prefix_java_common}tomcat-servlet-3.0-api
+BuildRequires:  %{?scl_prefix_java_common}junit
 
 %description
 An implementation of standard interfaces and abstract classes for
@@ -44,6 +45,7 @@ Summary:        API documentation for %{name}
 # remove all precompiled stuff
 find . -type f -name "*.jar" -exec rm -f {} \;
 
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 cat > build.properties <<EOBP
 build.compiler=modern
 junit.jar=$(build-classpath junit)
@@ -52,22 +54,25 @@ jsp-api.jar=$(build-classpath tomcat-jsp-2.2-api)
 servletapi.build.notrequired=true
 jspapi.build.notrequired=true
 EOBP
+%{?scl:EOF}
 
 # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1015612
 find . -iname 'ELParser.java' -exec sed -i 's:enum:enum1:g' \{\} \;
 
 %build
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 export CLASSPATH=
 export OPT_JAR_LIST=:
 %{ant} \
   -Dfinal.name=%{short_name} \
   -Dj2se.javadoc=%{_javadocdir}/java \
   jar javadoc
-
+%{?scl:EOF}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -p -m 644 dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{pkg_name}-%{version}.jar
@@ -87,21 +92,19 @@ install -pD -T -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.p
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{pkg_name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{pkg_name}-%{version}
 ln -s %{pkg_name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{pkg_name}
-
+%{?scl:EOF}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f .mfiles
 %defattr(-,root,root,-)
 %doc LICENSE.txt STATUS.html
 %{_javadir}/%{pkg_name}-%{version}.jar
 %{_javadir}/%{pkg_name}.jar
 %{_javadir}/%{short_name}-%{version}.jar
 %{_javadir}/%{short_name}.jar
-%{_mavenpomdir}/JPP-%{short_name}.pom
-%{_mavendepmapfragdir}/%{pkg_name}
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -111,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon May 11 2015 Mat Booth <mat.booth@redhat.com> - 1.0-31
+- Resolves: rhbz#1219013 - Fails to build from source
+
 * Fri Oct 10 2014 Mat Booth <mat.booth@redhat.com> - 1.0-30
 - Resolves: rhbz#1146976 - Drop conflicting obsoletes/provides