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

!9 [sync] PR-8: Revert last modification and provide glassfish-el's modules

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2022-10-28 07:32:07 +00:00 committed by Gitee
commit c5cab053ea
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
jakarta-el.spec
View File

@ -2,13 +2,12 @@
Name: jakarta-el Name: jakarta-el
Version: 4.0.0 Version: 4.0.0
Release: 2 Release: 3
Summary: Jakarta Expression Language Summary: Jakarta Expression Language
License: EPL-2.0 or GPLv2 with exceptions License: EPL-2.0 or GPLv2 with exceptions
URL: https://github.com/jakartaee/expression-language URL: https://github.com/jakartaee/expression-language
Source0: %{url}/archive/%{version}-RELEASE/%{srcname}-%{version}.tar.gz Source0: %{url}/archive/%{version}-RELEASE/%{srcname}-%{version}.tar.gz
BuildArch: noarch BuildArch: noarch
BuildRequires: maven-local BuildRequires: maven-local
@ -16,20 +15,20 @@ 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: jakarta-el = %{version}-%{release} Provides: glassfish-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,
reference implementation and TCK that describes an expression language reference implementation and TCK that describes an expression language
for Java applications. for Java applications.
This package contains the implementation. 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,
@ -41,8 +40,8 @@ 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}.
@ -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-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 "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_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 %{name}/jakarta.el glassfish-el
%mvn_file :jakarta.el-api %{name}/jakarta.el-api %mvn_file :jakarta.el-api %{name}/jakarta.el-api glassfish-el-api
%build %build
%mvn_build -s %mvn_build -s
@ -92,6 +91,9 @@ sed -i -e 's/jakarta\./javax./g' $(find api/src/main/java/javax -name *.java)
%changelog %changelog
* Wed May 25 2022 baizhonggui <baizhonggui@h-partners.com> - 4.0.0-3
- Revert last modification and provide glassfish-el's modules instead of glassfish-el
* Wed Feb 09 2022 wangkai <wangkai385@huawei.com> - 4.0.0-2 * Wed Feb 09 2022 wangkai <wangkai385@huawei.com> - 4.0.0-2
- Rename glassfish to jakarta for conflict with glassfish-el - Rename glassfish to jakarta for conflict with glassfish-el