- Move copy-platform back to %%{_datadir}/eclipse.
- Require gjdoc >= 0.7.7-14 as it generates consistent html across archs. - Move most of the doc plugins back to %%{_datatdir}/eclipse now that gjdoc is fixed.
This commit is contained in:
parent
e224b7c884
commit
d9e85387ed
@ -29,8 +29,7 @@ eclipse=$1; shift
|
||||
|
||||
mkdir $where
|
||||
cd $where
|
||||
mkdir plugins features fragments
|
||||
cp -r $eclipse/links .
|
||||
mkdir plugins features links
|
||||
|
||||
# Are there any optional arguments left?
|
||||
if [ $# -gt 0 ]; then
|
||||
|
37
eclipse.spec
37
eclipse.spec
@ -26,7 +26,7 @@ Epoch: 1
|
||||
Summary: An open, extensible IDE
|
||||
Name: eclipse
|
||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||
Release: 15%{?dist}
|
||||
Release: 16%{?dist}
|
||||
License: EPL
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
URL: http://www.eclipse.org/
|
||||
@ -142,6 +142,7 @@ BuildRequires: dos2unix
|
||||
%if %{gcj_support}
|
||||
BuildRequires: gcc-java >= 4.0.2
|
||||
BuildRequires: java-gcj-compat-devel >= 1.0.64
|
||||
BuildRequires: gjdoc >= 0.7.7-14
|
||||
%else
|
||||
BuildRequires: java-devel >= 1.4.2
|
||||
%endif
|
||||
@ -980,10 +981,10 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.update.core.linux_$UPD
|
||||
# FIXME: icu4j generates res_index.txt differently on different arches - possible libgcj bug.
|
||||
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/com.ibm.icu_3.4.5.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
|
||||
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/com.ibm.icu.source_3.4.5 $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
|
||||
# FIXME: the html in the doc plugins is generated differently on different
|
||||
# arches -- specifically <Class>-uses.html (e.g. IProblem-uses.html) are not
|
||||
# generated correctly.
|
||||
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/*doc* $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
|
||||
# FIXME: there is a problem with gjdoc with this plugin
|
||||
PLATFORMDOCISVVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep platform.doc.isv_ | sed 's/org.eclipse.platform.doc.isv_//')
|
||||
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.platform.doc.isv_$PLATFORMDOCISVVERSION \
|
||||
$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
|
||||
# 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.
|
||||
@ -1125,15 +1126,13 @@ popd
|
||||
cp %{SOURCE16} copy-platform
|
||||
(
|
||||
cd $RPM_BUILD_ROOT%{_datadir}/%{name}
|
||||
ls -d * | egrep -v '^(links|plugins|features)$'
|
||||
ls -d plugins/* features/*
|
||||
ls -d * | egrep -v '^(plugins|features|links|about_files)$'
|
||||
ls -d plugins/* features/* links/*
|
||||
) |
|
||||
sed -e's/^\(.*\)$/\1 \1/' -e's,^,ln -s $eclipse/,' >> copy-platform
|
||||
echo "ln -s %{_libdir}/eclipse fragments" >> copy-platform
|
||||
echo "sed --in-place s:%{_libdir}:\$where/fragments: links/fragments.link" >> copy-platform
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts
|
||||
cp copy-platform $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts
|
||||
cp copy-platform $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts
|
||||
|
||||
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
|
||||
## BEGIN ANT ##
|
||||
@ -1583,7 +1582,7 @@ rm -f %{_datadir}/%{name}/configuration/org.eclipse.update/platform.xml*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.tomcat_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.core.filebuffers_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.registry_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.platform.doc.user_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.platform.doc.user_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.text_*
|
||||
@ -1664,7 +1663,7 @@ rm -f %{_datadir}/%{name}/configuration/org.eclipse.update/platform.xml*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.ant.ui_*
|
||||
%{_datadir}/%{name}/plugins/org.junit_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.jdt.junit_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.user_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.user_*
|
||||
#%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.core_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.jdt.ui_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.jdt.debug_*
|
||||
@ -1695,20 +1694,20 @@ rm -f %{_datadir}/%{name}/configuration/org.eclipse.update/platform.xml*
|
||||
%files jdt-sdk
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/%{name}/features/org.eclipse.jdt.source_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.isv_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.isv_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.jdt.source_*
|
||||
|
||||
%files pde
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/%{name}/features/org.eclipse.pde_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.pde.doc.user_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.pde.doc.user_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.pde.build_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.pde.build
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.pde_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.pde.core_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.pde.junit.runtime_*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.pde.ui_*
|
||||
%{_libdir}/%{name}/buildscripts
|
||||
%{_datadir}/%{name}/buildscripts
|
||||
%if %{gcj_support}
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.pde_*
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.pde.core_*
|
||||
@ -1736,6 +1735,12 @@ rm -f %{_datadir}/%{name}/configuration/org.eclipse.update/platform.xml*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
|
||||
|
||||
%changelog
|
||||
* Mon Nov 06 2006 Ben Konrath <bkonrath@redhat.com> 3.2.1-16
|
||||
- Move copy-platform back to %%{_datadir}/eclipse.
|
||||
- Require gjdoc >= 0.7.7-14 as it generates consistent html across archs.
|
||||
- Move most of the doc plugins back to %%{_datatdir}/eclipse now that gjdoc
|
||||
is fixed.
|
||||
|
||||
* Fri Nov 03 2006 Andrew Overholt <overholt@redhat.com> 3.2.1-15
|
||||
- Make sdk require config.ini itself rather than the package to deal with the
|
||||
bi-arch installation situation.
|
||||
|
Loading…
Reference in New Issue
Block a user