diff --git a/jboss-el-3.0-api.spec b/jboss-el-3.0-api.spec index 8122c02..3c7fd5d 100644 --- a/jboss-el-3.0-api.spec +++ b/jboss-el-3.0-api.spec @@ -1,20 +1,19 @@ -%global namedreltag .Final -%global namedversion %{version}%{?namedreltag} - Name: jboss-el-3.0-api Version: 1.0.13 -Release: 4%{dist} +Release: 5%{dist} Summary: JSR-341 Expression Language 3.0 API License: (CDDL or GPLv2 with exceptions) and ASL 2.0 -Url: https://github.com/jboss/jboss-el-api_spec + +%global namedreltag .Final +%global namedversion %{version}%{?namedreltag} + +URL: https://github.com/jboss/jboss-el-api_spec Source0: %{url}/archive/jboss-el-api_3.0_spec-%{namedversion}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: cddl.txt BuildRequires: maven-local -BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.glassfish:javax.el-impl) BuildRequires: mvn(org.jboss:jboss-parent:pom:) BuildArch: noarch @@ -36,10 +35,13 @@ cp %{SOURCE2} . %pom_remove_plugin :maven-source-plugin +%pom_change_dep :javax.el-impl :javax.el + sed -i "s,59 Temple Place,51 Franklin Street,;s,Suite 330,Fifth Floor,;s,02111-1307,02110-1301," LICENSE %build -%mvn_build +# tests are broken with the version of el in fedora 33+ +%mvn_build -f %install %mvn_install @@ -52,6 +54,9 @@ sed -i "s,59 Temple Place,51 Franklin Street,;s,Suite 330,Fifth Floor,;s,02111-1 %license LICENSE cddl.txt LICENSE-2.0.txt %changelog +* Sat Aug 29 2020 Fabio Valentini - 1.0.13-5 +- Disable tests. They are incompatible with jakarta-el 4.0. + * Tue Jul 28 2020 Fedora Release Engineering - 1.0.13-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild