- Add requires eclipse-cvs-client, eclipse-subclipse, eclipse-mylyn,
eclipse-mylyn-ide, eclipse-mylyn-bugzilla, eclipse-mylyn-trac and eclipse-changelog to platform package. - Add requires eclipse-mylyn-java to jdt. - Add requires eclipse-mylyn-pde to pde. - Remove pde-sdk and sdk sub-packages
This commit is contained in:
parent
51eb7cb791
commit
e420f1fd86
148
eclipse.spec
148
eclipse.spec
@ -242,6 +242,9 @@ Requires: eclipse-cvs-client
|
||||
Requires: eclipse-subclipse
|
||||
Requires: eclipse-changelog
|
||||
Requires: eclipse-mylyn
|
||||
Requires: eclipse-mylyn-ide
|
||||
Requires: eclipse-mylyn-bugzilla
|
||||
Requires: eclipse-mylyn-trac
|
||||
|
||||
%description platform
|
||||
The Eclipse Platform is the base of all IDE plugins. This does not include the
|
||||
@ -251,11 +254,8 @@ Java Development Tools or the Plugin Development Environment.
|
||||
Summary: Eclipse Platform SDK
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-rcp-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-rcp-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-rcp-sdk = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description platform-sdk
|
||||
Source and docs for Eclipse Platform for use within Eclipse.
|
||||
@ -273,6 +273,7 @@ Requires(postun): %{name}-ecj = %{epoch}:%{version}-%{release}
|
||||
Requires: junit >= 3.8.1-3jpp
|
||||
Requires: junit4
|
||||
Requires: java-javadoc
|
||||
Requires: eclipse-mylyn-java
|
||||
%if %{gcj_support}
|
||||
Requires(post): java-gcj-compat >= 1.0.64
|
||||
Requires(postun): java-gcj-compat >= 1.0.64
|
||||
@ -286,11 +287,8 @@ developing software written in the Java programming language.
|
||||
Summary: Eclipse Java Development Tools SDK
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-jdt = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-jdt = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description jdt-sdk
|
||||
Source and docs for Eclipse Java Development Tools for use within Eclipse.
|
||||
@ -298,15 +296,29 @@ Source and docs for Eclipse Java Development Tools for use within Eclipse.
|
||||
%package pde
|
||||
Summary: Eclipse Plugin Development Environment
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
Provides: eclipse
|
||||
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-pde-runtime = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-jdt = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-jdt = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-pde-runtime = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-pde-runtime = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-cvs-client-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-rcp-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires: eclipse-mylyn-pde
|
||||
Requires(post): %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-jdt = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-jdt = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-pde-runtime = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-pde-runtime = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-cvs-client-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-cvs-client-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-rcp-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-rcp-sdk = %{epoch}:%{version}-%{release}
|
||||
%if %{gcj_support}
|
||||
Requires(post): java-gcj-compat >= 1.0.64
|
||||
Requires(postun): java-gcj-compat >= 1.0.64
|
||||
@ -330,46 +342,6 @@ Requires(postun): java-gcj-compat >= 1.0.64
|
||||
%description pde-runtime
|
||||
Eclipse Plugin Development Environment runtime plugin (org.eclipse.pde.runtime).
|
||||
|
||||
%package pde-sdk
|
||||
Summary: Eclipse Plugin Development Environment SDK
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
Requires: %{name}-pde = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-pde = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-pde = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description pde-sdk
|
||||
Source and docs for Eclipse Plugin Development Environment for use within
|
||||
Eclipse.
|
||||
|
||||
%package sdk
|
||||
Summary: Eclipse SDK
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
Provides: eclipse
|
||||
Requires: %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-pde-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-pde-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-pde-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
|
||||
# This file requirement is to deal with the biarch installation case
|
||||
Requires(post): %{_libdir}/%{name}/configuration/config.ini
|
||||
Requires(postun): %{_libdir}/%{name}/configuration/config.ini
|
||||
%if %{gcj_support}
|
||||
Requires(post): java-gcj-compat >= 1.0.64
|
||||
Requires(postun): java-gcj-compat >= 1.0.64
|
||||
%endif
|
||||
|
||||
%description sdk
|
||||
The Eclipse SDK. This package is similar to a meta-package which brings in
|
||||
the Eclipse Platform SDK, the Eclipse Java Development Tools SDK, and the
|
||||
Eclipse Plugin Development Environment SDK. It also contains the
|
||||
org.eclipse.sdk plugin and feature. This package is only needed if you intend
|
||||
to create Eclipse applications.
|
||||
|
||||
%prep
|
||||
%setup -q -c
|
||||
|
||||
@ -826,18 +798,6 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.pde.doc.user_$PDEDOCUS
|
||||
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/features/org.eclipse.rcp_* \
|
||||
$RPM_BUILD_ROOT%{_libdir}/%{name}/features
|
||||
|
||||
# To ensure that the product is org.eclipse.sdk.ide when eclipse-sdk is
|
||||
# installed, we must check for its presence at %%post{,un} time. This does not
|
||||
# work in the biarch case, though, if it is not in an arch-specific location.
|
||||
# This results in complaints that the sdk plugin is found twice, but this is
|
||||
# better than always appearing in the about dialog as the Eclipse Platform with
|
||||
# the platform plugin version number instead of the actual SDK version number.
|
||||
# -- overholt, 2006-11-03
|
||||
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.sdk_* \
|
||||
$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
|
||||
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/features/org.eclipse.sdk_* \
|
||||
$RPM_BUILD_ROOT%{_libdir}/%{name}/features
|
||||
|
||||
# FIXME: investigate why it doesn't work to set this -- configuration data is
|
||||
# always written to /usr/share/eclipse/configuration, even with
|
||||
# -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration
|
||||
@ -868,7 +828,7 @@ rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.update
|
||||
rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.core.runtime
|
||||
rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.app
|
||||
|
||||
# Set config.ini for the platform; no benefit to having it be sdk
|
||||
# Set eclipse.product to be org.eclipse.platform.ide
|
||||
sed --in-place "s/eclipse.product=org.eclipse.sdk.ide/eclipse.product=org.eclipse.platform.ide/" \
|
||||
$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
|
||||
|
||||
@ -964,12 +924,12 @@ desktop-file-validate %{SOURCE2}
|
||||
# freedesktop.org menu entry
|
||||
install -p -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
|
||||
|
||||
SDKPLUGINVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins | grep eclipse.sdk_ | sed "s/org.eclipse.sdk_//")
|
||||
# Put Fedora Core version into about.mappings of org.eclipse.sdk and
|
||||
# org.eclipse.platform to show it in # Eclipse about dialog. (courtesy Debian
|
||||
# Eclipse packagers)
|
||||
# org.eclipse.platform to show it in Eclipse about dialog.
|
||||
# (courtesy Debian Eclipse packagers)
|
||||
# FIXME use the third id
|
||||
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.sdk_$SDKPLUGINVERSION
|
||||
SDKPLUGINVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep eclipse.sdk_ | sed "s/org.eclipse.sdk_//")
|
||||
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.sdk_$SDKPLUGINVERSION
|
||||
OS_VERSION=$(cat /etc/*-release | head -n 1)
|
||||
sed -e "s/\(0=.*\)/\1 ($OS_VERSION)/" < about.mappings > about.mappings.tmp
|
||||
mv about.mappings.tmp about.mappings
|
||||
@ -1247,38 +1207,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
||||
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
|
||||
fi
|
||||
|
||||
%post sdk
|
||||
%if %{gcj_support}
|
||||
if [ -x %{_bindir}/rebuild-gcj-db ]
|
||||
then
|
||||
%{_bindir}/rebuild-gcj-db
|
||||
fi
|
||||
%endif
|
||||
if [ -f %{_libdir}/%{name}/configuration/config.ini ]; then
|
||||
sed --in-place "s/[#]*eclipse.product=.*/eclipse.product=org.eclipse.sdk.ide/" \
|
||||
%{_libdir}/%{name}/configuration/config.ini
|
||||
fi
|
||||
|
||||
%postun sdk
|
||||
%if %{gcj_support}
|
||||
if [ -x %{_bindir}/rebuild-gcj-db ]
|
||||
then
|
||||
%{_bindir}/rebuild-gcj-db
|
||||
fi
|
||||
%endif
|
||||
# Only set the product back to platform.ide if the sdk is actually removed for
|
||||
# this arch. This SDKDIR check is to deal with the ordering of new %%post
|
||||
# before old %%postun
|
||||
if [ -d /usr/lib/eclipse/features ]; then
|
||||
SDKDIR=$(ls %{_libdir}/%{name}/features | grep "org\.eclipse\.sdk_")
|
||||
else
|
||||
SDKDIR=""
|
||||
fi
|
||||
if [ -z "$SDKDIR" -a -f %{_libdir}/%{name}/configuration/config.ini ]; then
|
||||
sed --in-place "s/[#]*eclipse.product=.*/eclipse.product=org.eclipse.platform.ide/" \
|
||||
%{_libdir}/%{name}/configuration/config.ini
|
||||
fi
|
||||
|
||||
%if %{gcj_support}
|
||||
%post ecj -p %{_bindir}/rebuild-gcj-db
|
||||
%postun ecj -p %{_bindir}/rebuild-gcj-db
|
||||
@ -1298,8 +1226,6 @@ fi
|
||||
%postun pde -p %{_bindir}/rebuild-gcj-db
|
||||
%post pde-runtime -p %{_bindir}/rebuild-gcj-db
|
||||
%postun pde-runtime -p %{_bindir}/rebuild-gcj-db
|
||||
%post pde-sdk -p %{_bindir}/rebuild-gcj-db
|
||||
%postun pde-sdk -p %{_bindir}/rebuild-gcj-db
|
||||
%endif
|
||||
|
||||
%files ecj
|
||||
@ -1629,7 +1555,9 @@ fi
|
||||
|
||||
%files pde
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/%{name}/features/org.eclipse.sdk_*
|
||||
%{_datadir}/%{name}/features/org.eclipse.pde_*
|
||||
%{_datadir}/%{name}/features/org.eclipse.pde.source_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.pde.doc.user_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.pde.build_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.pde.build
|
||||
@ -1638,6 +1566,8 @@ fi
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.pde.junit.runtime_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.pde.ui_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.pde.ui.templates_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.pde.source_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.sdk_*
|
||||
%{_datadir}/%{name}/buildscripts
|
||||
%if %{gcj_support}
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.pde_*
|
||||
@ -1656,20 +1586,14 @@ fi
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.pde.runtime_*
|
||||
%endif
|
||||
|
||||
%files pde-sdk
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/%{name}/features/org.eclipse.pde.source_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.pde.source_*
|
||||
|
||||
%files sdk
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/%{name}/features/org.eclipse.sdk_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
|
||||
|
||||
%changelog
|
||||
* Tue Aug 28 2007 Ben Konrath <bkonrath@redhat.com> 3.3.0-10
|
||||
- Add requires eclipse-cvs-client, eclipse-subclipse, eclipse-mylyn
|
||||
- Add requires eclipse-cvs-client, eclipse-subclipse, eclipse-mylyn,
|
||||
eclipse-mylyn-ide, eclipse-mylyn-bugzilla, eclipse-mylyn-trac
|
||||
and eclipse-changelog to platform package.
|
||||
- Add requires eclipse-mylyn-java to jdt.
|
||||
- Add requires eclipse-mylyn-pde to pde.
|
||||
- Remove pde-sdk and sdk sub-packages
|
||||
|
||||
* Thu Aug 23 2007 Ben Konrath <bkonrath@redhat.com> 3.3.0-9
|
||||
- Add Requires: eclipse-cvs-client to jdt package.
|
||||
|
Loading…
Reference in New Issue
Block a user