diff --git a/jakarta-el.spec b/jakarta-el.spec index 5769f10..c706c8b 100644 --- a/jakarta-el.spec +++ b/jakarta-el.spec @@ -2,13 +2,12 @@ Name: jakarta-el Version: 4.0.0 -Release: 2 +Release: 3 Summary: Jakarta Expression Language License: EPL-2.0 or GPLv2 with exceptions URL: https://github.com/jakartaee/expression-language Source0: %{url}/archive/%{version}-RELEASE/%{srcname}-%{version}.tar.gz - BuildArch: noarch BuildRequires: maven-local @@ -16,20 +15,20 @@ BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.surefire:surefire-junit47) -Provides: jakarta-el = %{version}-%{release} +Provides: glassfish-el = %{version}-%{release} +Obsoletes: glassfish-el < 3.0.1-1 %description Jakarta Expression Language provides a specification document, API, reference implementation and TCK that describes an expression language for Java applications. - This package contains the implementation. %package api Summary: Jakarta Expression Language API - -Provides: jakarta-el-api = %{version}-%{release} +Provides: glassfish-el-api = %{version}-%{release} +Obsoletes: glassfish-el-api < 3.0.1-1 %description api Jakarta Expression Language provides a specification document, API, @@ -41,8 +40,8 @@ This package contains only the API. %package javadoc Summary: Javadoc for %{name} - -Provides: jakarta-el-javadoc = %{version}-%{release} +Provides: glassfish-el-javadoc = %{version}-%{release} +Obsoletes: glassfish-el-javadoc < 3.0.1-1 %description javadoc This package contains javadoc for %{name}. @@ -65,11 +64,11 @@ sed -i -e 's/jakarta\./javax./g' $(find api/src/main/java/javax -name *.java) %pom_remove_plugin -r :maven-javadoc-plugin %pom_remove_plugin -r :maven-source-plugin +%mvn_alias org.glassfish:jakarta.el org.glassfish:javax.el "org.eclipse.jetty.orbit:com.sun.el" "org.glassfish.web:javax.el" "org.glassfish:javax.el-impl" %mvn_alias jakarta.el:jakarta.el-api javax.el:javax.el-api javax.el:el-api -%mvn_file :jakarta.el %{name}/jakarta.el -%mvn_file :jakarta.el-api %{name}/jakarta.el-api - +%mvn_file :jakarta.el %{name}/jakarta.el glassfish-el +%mvn_file :jakarta.el-api %{name}/jakarta.el-api glassfish-el-api %build %mvn_build -s @@ -92,6 +91,9 @@ sed -i -e 's/jakarta\./javax./g' $(find api/src/main/java/javax -name *.java) %changelog +* Wed May 25 2022 baizhonggui - 4.0.0-3 +- Revert last modification and provide glassfish-el's modules instead of glassfish-el + * Wed Feb 09 2022 wangkai - 4.0.0-2 - Rename glassfish to jakarta for conflict with glassfish-el