From da1e536d623afa4f858aea7d92f592ea67939479 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 04 2015 07:11:50 +0000 Subject: import devtoolset-3-glassfish-servlet-api-3.1.0-6.el7 --- diff --git a/SPECS/glassfish-servlet-api.spec b/SPECS/glassfish-servlet-api.spec index fcb48fa..22fcbd1 100644 --- a/SPECS/glassfish-servlet-api.spec +++ b/SPECS/glassfish-servlet-api.spec @@ -1,11 +1,12 @@ %{?scl:%scl_package glassfish-servlet-api} %{!?scl:%global pkg_name %{name}} +%{?java_common_find_provides_and_requires} %global artifactId javax.servlet-api Name: %{?scl_prefix}glassfish-servlet-api Version: 3.1.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java Servlet API License: (CDDL or GPLv2 with exceptions) and ASL 2.0 URL: http://servlet-spec.java.net @@ -16,10 +17,9 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildArch: noarch -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: jvnet-parent -BuildRequires: maven-local -BuildRequires: maven-source-plugin +BuildRequires: %{?scl_prefix_maven}jvnet-parent +BuildRequires: %{?scl_prefix_java_common}maven-local +BuildRequires: %{?scl_prefix_maven}maven-source-plugin %description @@ -36,7 +36,7 @@ API documentation for %{name}. %prep %setup -q -n %{artifactId}-%{version} -%{?scl:scl enable %{scl} - <<"EOF"} +%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} %pom_remove_plugin :maven-remote-resources-plugin cp -p %{SOURCE1} . # README contains also part of javax.servlet-api license @@ -45,12 +45,12 @@ cp -p src/main/resources/META-INF/README . %{?scl:EOF} %build -%{?scl:scl enable %{scl} - <<"EOF"} +%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} %mvn_build %{?scl:EOF} %install -%{?scl:scl enable %{scl} - <<"EOF"} +%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} %mvn_install %{?scl:EOF} @@ -61,6 +61,9 @@ cp -p src/main/resources/META-INF/README . %doc LICENSE-2.0.txt README %changelog +* Mon May 11 2015 Mat Booth - 3.1.0-6 +- Resolves: rhbz#1219013 - Fails to build from source + * Tue May 20 2014 Alexander Kurtakov 3.1.0-5 - Fix name of jars to be pkg_name instead of name.