diff --git a/.gitignore b/.gitignore index 696be19..fcdd0f6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /org.eclipse.tm.terminal-*.tar.xz /*.src.rpm /org.eclipse.tm-6b04c544d33c31b1f3da168d0e606d8d20ed541d.tar.xz +/org.eclipse.tm-3ba744c9c82dcd8df82263254431180b7db6e93a.tar.xz diff --git a/eclipse-tm-terminal.spec b/eclipse-tm-terminal.spec index 45e20ed..9477edc 100644 --- a/eclipse-tm-terminal.spec +++ b/eclipse-tm-terminal.spec @@ -1,17 +1,12 @@ -%global git_tag 6b04c544d33c31b1f3da168d0e606d8d20ed541d +%global git_tag 3ba744c9c82dcd8df82263254431180b7db6e93a # Set this to avoid building CDT and remotes bundles to eliminate # a circular dep on CDT->tm-terminal->remote->CDT %bcond_with bootstrap -# RSE server locations -%global rseserver_install %{_datadir}/eclipse-rse-server -%global rseserver_java %{_datadir}/java/eclipse-rse-server -%global rseserver_config %{_sysconfdir}/sysconfig/rseserver - Name: eclipse-tm-terminal -Version: 4.5.100 -Release: 2%{?dist} +Version: 4.5.102 +Release: 1%{?dist} Summary: Terminal plug-in for Eclipse License: EPL-2.0 @@ -19,11 +14,6 @@ URL: https://www.eclipse.org/tm/ Source0: https://git.eclipse.org/c/tm/org.eclipse.tm.git/snapshot/org.eclipse.tm-%{git_tag}.tar.xz Patch0: 0001-Fix-feature-includes.patch -# Use Authen::pam to authenticate clients -Patch1: eclipse-rse-server-auth-pl.patch -# Fix classpath in daemon and server scripts to point -# to install locations -Patch2: eclipse-rse-server-scripts.patch BuildArch: noarch @@ -42,24 +32,14 @@ BuildRequires: eclipse-remote BuildRequires: rxtx >= 2.2-0.15 %endif -%description -An integrated Eclipse View for the local command prompt (console) or -remote hosts (SSH, Telnet, Serial). - -%package rse -Summary: Eclipse Remote System Explorer -Recommends: perl-interpreter -Recommends: perl-Authen-PAM - # Obsoletes/Provides added in F30 Obsoletes: eclipse-rse < %{version}-%{release} -Provides: eclipse-rse = %{version}-%{release} Obsoletes: eclipse-rse-server < %{version}-%{release} -Provides: eclipse-rse-server = %{version}-%{release} +Obsoletes: %{name}-rse < %{version}-%{release} -%description rse -Remote System Explorer (RSE) is a framework and toolkit in Eclipse Workbench -that allows you to connect and work with a variety of remote systems. +%description +An integrated Eclipse View for the local command prompt (console) or +remote hosts (SSH, Telnet, Serial). %if %{without bootstrap} %package connectors @@ -82,8 +62,6 @@ Sources and developer resources for the Terminal plug-in for Eclipse. %prep %setup -q -n org.eclipse.tm-%{git_tag} %patch0 -p1 -%patch1 -%patch2 # Don't need to build repo for RPM builds %pom_disable_module site @@ -95,10 +73,13 @@ sed -i -e '/license-feature-version/s/1\.0\.1\.qualifier/0.0.0/' \ $(find -name feature.xml) # Don't ship tests, examples, etc -%pom_disable_module tests rse %pom_disable_module org.eclipse.tm.terminal.test terminal/plugins -%pom_disable_module examples rse -%pom_disable_module org.eclipse.rse.ui.capabilities rse/plugins + +# Don't build and ship obsolete RSE plugins +%pom_disable_module rse +%pom_disable_module org.eclipse.tm.terminal.view.ui.rse terminal/plugins +%pom_disable_module org.eclipse.tm.terminal.view.rse.feature terminal/features +%pom_disable_module org.eclipse.tm.terminal.view.rse.sdk.feature terminal/features # When bootstrapping, disable the plugins and features that # create cyclical dependencies @@ -121,7 +102,6 @@ sed -i -e '/license-feature-version/s/1\.0\.1\.qualifier/0.0.0/' \ # Fix trying to include non-existent files sed -i -e "s|feature.properties,\\\|feature.properties|g" terminal/features/org.eclipse.tm.terminal.view.feature/build.properties sed -i -e "s|p2.inf||g" terminal/features/org.eclipse.tm.terminal.view.feature/build.properties -sed -i -e '/index/d' rse/doc/*/build.properties # Enable serial connector sed -i -e '//s///' \ @@ -132,8 +112,6 @@ sed -i -e '//s/