diff --git a/jakarta-el.spec b/jakarta-el.spec index bd01e78..5769f10 100644 --- a/jakarta-el.spec +++ b/jakarta-el.spec @@ -2,7 +2,7 @@ Name: jakarta-el Version: 4.0.0 -Release: 1 +Release: 2 Summary: Jakarta Expression Language License: EPL-2.0 or GPLv2 with exceptions @@ -16,8 +16,7 @@ BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.surefire:surefire-junit47) -Provides: glassfish-el = %{version}-%{release} -Obsoletes: glassfish-el < 3.0.1-1 +Provides: jakarta-el = %{version}-%{release} %description Jakarta Expression Language provides a specification document, API, @@ -30,8 +29,7 @@ This package contains the implementation. %package api Summary: Jakarta Expression Language API -Provides: glassfish-el-api = %{version}-%{release} -Obsoletes: glassfish-el-api < 3.0.1-1 +Provides: jakarta-el-api = %{version}-%{release} %description api Jakarta Expression Language provides a specification document, API, @@ -44,8 +42,7 @@ This package contains only the API. %package javadoc Summary: Javadoc for %{name} -Provides: glassfish-el-javadoc = %{version}-%{release} -Obsoletes: glassfish-el-javadoc < 3.0.1-1 +Provides: jakarta-el-javadoc = %{version}-%{release} %description javadoc This package contains javadoc for %{name}. @@ -68,11 +65,10 @@ 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 %mvn_alias jakarta.el:jakarta.el-api javax.el:javax.el-api javax.el:el-api -%mvn_file :jakarta.el %{name}/jakarta.el glassfish-el -%mvn_file :jakarta.el-api %{name}/jakarta.el-api glassfish-el-api +%mvn_file :jakarta.el %{name}/jakarta.el +%mvn_file :jakarta.el-api %{name}/jakarta.el-api %build @@ -96,5 +92,8 @@ sed -i -e 's/jakarta\./javax./g' $(find api/src/main/java/javax -name *.java) %changelog +* Wed Feb 09 2022 wangkai - 4.0.0-2 +- Rename glassfish to jakarta for conflict with glassfish-el + * Wed Feb 09 2022 wangkai - 4.0.0-1 - Package init