diff --git a/eclipse.spec b/eclipse.spec index 57cd3c6..ea9be5b 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -27,14 +27,14 @@ Epoch: 1 # Eclipse is arch-specific, but multilib agnostic %global _eclipsedir %{_prefix}/lib/eclipse -%if 0%{?fedora} || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} > 7 || 0%{?eln} %global use_wayland 1 %else %global use_wayland 0 %endif # Glassfish EE APIs that moved to jakarta namespace -%if 0%{?fedora} >= 33 +%if 0%{?fedora} >= 33 || 0%{?eln} %global _jakarta_annotations jakarta.annotation-api %global _jakarta_servlet_api jakarta.servlet-api %global _jakarta_jsp_api javax.servlet.jsp-api @@ -53,7 +53,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: 4.16 -Release: 13%{?dist} +Release: 14%{?dist} License: EPL-2.0 URL: https://www.eclipse.org/ @@ -882,7 +882,7 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/com.ibm.icu_* %{_eclipsedir}/plugins/com.jcraft.jsch_* %{_eclipsedir}/plugins/javax.* -%if 0%{?fedora} >= 33 +%if 0%{?fedora} >= 33 || 0%{?eln} %{_eclipsedir}/plugins/jakarta.* %{_eclipsedir}/plugins/org.glassfish.jakarta.el_* %{_eclipsedir}/plugins/org.glassfish.web.jakarta.servlet.jsp_* @@ -1061,6 +1061,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Tue Oct 27 2020 Jie Kang - 1:4.16-14 +- Update fedora macros to include eln + * Tue Aug 25 2020 Mat Booth - 1:4.16-13 - Platform actually requires OpenJDK devel package for ct.sym