- Fix eclipse-ecj symlink to point to correct location.
- Put SWT symlinks in %%{_libdir} instead of %%{_datadir} as they're target-dependent.
This commit is contained in:
parent
b0338adaa5
commit
86fa7c9de0
13
eclipse.spec
13
eclipse.spec
|
@ -986,17 +986,17 @@ for lib in $(find %{name}/configuration -name libswt\*.so); do
|
||||||
done
|
done
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# Install the SWT symlinks in javadir
|
# Install the SWT symlinks in libdir
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
|
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
|
||||||
swtjarversion=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
|
swtjarversion=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
|
||||||
pushd $RPM_BUILD_ROOT%{_javadir}
|
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
|
||||||
ln -s %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_$swtjarversion.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
|
ln -s %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_$swtjarversion.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
|
||||||
ln -s swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.jar
|
ln -s swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.jar
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# Install the eclipse-ecj.jar symlink for java-1.4.2-gcj-compat's "javac"
|
# Install the eclipse-ecj.jar symlink for java-1.4.2-gcj-compat's "javac"
|
||||||
JDTCORESUFFIX=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep jdt.core_ | sed "s/org.eclipse.jdt.core_//")
|
JDTCORESUFFIX=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep jdt.core_ | sed "s/org.eclipse.jdt.core_//")
|
||||||
ln -s %{_javadir}/plugins/org.eclipse.jdt.core_$JDTCORESUFFIX $RPM_BUILD_ROOT%{_javadir}/eclipse-ecj.jar
|
ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_$JDTCORESUFFIX $RPM_BUILD_ROOT%{_javadir}/eclipse-ecj.jar
|
||||||
ln -s %{_javadir}/eclipse-ecj.jar $RPM_BUILD_ROOT%{_javadir}/jdtcore.jar
|
ln -s %{_javadir}/eclipse-ecj.jar $RPM_BUILD_ROOT%{_javadir}/jdtcore.jar
|
||||||
|
|
||||||
# FIXME: get rid of this by putting logic in package build to know what version
|
# FIXME: get rid of this by putting logic in package build to know what version
|
||||||
|
@ -1342,7 +1342,7 @@ rm -f %{_datadir}/%{name}/configuration/org.eclipse.update/platform.xml*
|
||||||
# FIXME: do we need to build?
|
# FIXME: do we need to build?
|
||||||
#%{_libdir}/%{name}/libcairo-swt.so
|
#%{_libdir}/%{name}/libcairo-swt.so
|
||||||
#%{_libdir}/libcairo-swt.so
|
#%{_libdir}/libcairo-swt.so
|
||||||
%{_javadir}/swt-gtk*.jar
|
%{_libdir}/%{name}/plugins/swt-gtk*.jar
|
||||||
%if %{gcj_support}
|
%if %{gcj_support}
|
||||||
%dir %{_libdir}/gcj/%{name}
|
%dir %{_libdir}/gcj/%{name}
|
||||||
%{_libdir}/gcj/%{name}/org.eclipse.swt.gtk.linux.%{eclipse_arch}_*
|
%{_libdir}/gcj/%{name}/org.eclipse.swt.gtk.linux.%{eclipse_arch}_*
|
||||||
|
@ -1629,6 +1629,11 @@ rm -f %{_datadir}/%{name}/configuration/org.eclipse.update/platform.xml*
|
||||||
%{_datadir}/%{name}/plugins/org.eclipse.sdk_*
|
%{_datadir}/%{name}/plugins/org.eclipse.sdk_*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Oct 30 2006 Andrew Overholt <overholt@redhat.com> 3.2.1-8
|
||||||
|
- Fix eclipse-ecj symlink to point to correct location.
|
||||||
|
- Put SWT symlinks in %%{_libdir} instead of %%{_datadir} as they're
|
||||||
|
target-dependent.
|
||||||
|
|
||||||
* Sat Oct 28 2006 Ben Konrath <bkonrath@redhat.com> 3.2.1-7
|
* Sat Oct 28 2006 Ben Konrath <bkonrath@redhat.com> 3.2.1-7
|
||||||
- Add patch for ecj [] classpath problem.
|
- Add patch for ecj [] classpath problem.
|
||||||
- Remove configuration files from rcp files list.
|
- Remove configuration files from rcp files list.
|
||||||
|
|
Loading…
Reference in New Issue