packages/jakarta-el
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!5 Rename glassfish to jakarta for conflict with glassfish-el

Browse Source 
From: @wk333 
Reviewed-by: @licihua 
Signed-off-by: @licihua
This commit is contained in:
openeuler-ci-bot 2022-02-22 06:15:20 +00:00 committed by Gitee
commit f1f38aa263
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jakarta-el.spec
View File

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