Further munging of bundle directories in swt and platform files section.
This commit is contained in:
parent
25f4d7130a
commit
de13a3545e
24
eclipse.spec
24
eclipse.spec
|
@ -690,7 +690,8 @@ for l in `find configuration -name \*.so`; do
|
||||||
pushd `dirname $l`;
|
pushd `dirname $l`;
|
||||||
ln -sf %{_libdir}/%{name}/`basename $l`;
|
ln -sf %{_libdir}/%{name}/`basename $l`;
|
||||||
popd;
|
popd;
|
||||||
# Make note of the SWT bundle number for later
|
# SWT bundle stuff should go in libswt3-gtk
|
||||||
|
# Contents of other bundles should go in eclipse-platform
|
||||||
if [ "`basename $l`" = "libswt-gtk-%{swt_version}.so" ]
|
if [ "`basename $l`" = "libswt-gtk-%{swt_version}.so" ]
|
||||||
then
|
then
|
||||||
pushd `dirname $l`;
|
pushd `dirname $l`;
|
||||||
|
@ -699,6 +700,16 @@ for l in `find configuration -name \*.so`; do
|
||||||
# Add this directory to the files list for libswt
|
# Add this directory to the files list for libswt
|
||||||
echo $currentDir | gawk -F '/' '{ print "/"$5"/"$6"/"$7"/"$8"/"$9"/"$10"/"$11 }' > %{_builddir}/%{buildsubdir}/%{libname}-gtk2.install;
|
echo $currentDir | gawk -F '/' '{ print "/"$5"/"$6"/"$7"/"$8"/"$9"/"$10"/"$11 }' > %{_builddir}/%{buildsubdir}/%{libname}-gtk2.install;
|
||||||
popd
|
popd
|
||||||
|
elif [ "`basename $l`" = "libswt-atk-gtk-%{swt_version}.so" ]; then
|
||||||
|
echo `basename $l`;
|
||||||
|
elif [ "`basename $l`" = "libswt-awk-gtk-%{swt_version}.so" ]; then
|
||||||
|
echo `basename $l`;
|
||||||
|
elif [ "`basename $l`" = "libswt-gnome-gtk-%{swt_version}.so" ]; then
|
||||||
|
echo `basename $l`;
|
||||||
|
elif [ "`basename $l`" = "libswt-mozilla-gtk-%{swt_version}.so" ]; then
|
||||||
|
echo `basename $l`;
|
||||||
|
elif [ "`basename $l`" = "libswt-pi-gtk-%{swt_version}.so" ]; then
|
||||||
|
echo `basename $l`;
|
||||||
else
|
else
|
||||||
pushd `dirname $l`;
|
pushd `dirname $l`;
|
||||||
cd ../..;
|
cd ../..;
|
||||||
|
@ -1019,9 +1030,6 @@ fi
|
||||||
%dir %{_datadir}/%{name}
|
%dir %{_datadir}/%{name}
|
||||||
%dir %{_datadir}/%{name}/plugins
|
%dir %{_datadir}/%{name}/plugins
|
||||||
%dir %{_datadir}/%{name}/features
|
%dir %{_datadir}/%{name}/features
|
||||||
%dir %{_datadir}/%{name}/configuration
|
|
||||||
%dir %{_datadir}/%{name}/configuration/org.eclipse.osgi
|
|
||||||
%dir %{_datadir}/%{name}/configuration/org.eclipse.osgi/bundles
|
|
||||||
%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_3.*
|
%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_3.*
|
||||||
%{_datadir}/%{name}/plugins/jdtCompilerAdapter.jar
|
%{_datadir}/%{name}/plugins/jdtCompilerAdapter.jar
|
||||||
%{_datadir}/java/eclipse-ecj.jar
|
%{_datadir}/java/eclipse-ecj.jar
|
||||||
|
@ -1116,11 +1124,15 @@ fi
|
||||||
%{_libdir}/%{name}/eclipse
|
%{_libdir}/%{name}/eclipse
|
||||||
%{_libdir}/%{name}/libcore*
|
%{_libdir}/%{name}/libcore*
|
||||||
%{_libdir}/%{name}/libupdate*
|
%{_libdir}/%{name}/libupdate*
|
||||||
|
# This is all from our FileInitializer extraction of .sos
|
||||||
|
# all extracted bundles other than SWT will be in eclipse-platform.install
|
||||||
%dir %{_datadir}/%{name}/configuration
|
%dir %{_datadir}/%{name}/configuration
|
||||||
%dir %{_datadir}/%{name}/configuration/org.eclipse.osgi
|
%dir %{_datadir}/%{name}/configuration/org.eclipse.osgi
|
||||||
%dir %{_datadir}/%{name}/configuration/org.eclipse.osgi/bundles
|
%dir %{_datadir}/%{name}/configuration/org.eclipse.osgi/bundles
|
||||||
%{_datadir}/%{name}/configuration/org.eclipse.osgi/.*
|
%{_datadir}/%{name}/configuration/org.eclipse.osgi/.bundledata*
|
||||||
# all extracted bundles other than SWT will be in eclipse-platform.install
|
%{_datadir}/%{name}/configuration/org.eclipse.osgi/.lazy*
|
||||||
|
%{_datadir}/%{name}/configuration/org.eclipse.osgi/.manager
|
||||||
|
%{_datadir}/%{name}/configuration/org.eclipse.osgi/.state*
|
||||||
%{_datadir}/%{name}/configuration/config.ini
|
%{_datadir}/%{name}/configuration/config.ini
|
||||||
%{_datadir}/%{name}/configuration/org.eclipse.core.runtime
|
%{_datadir}/%{name}/configuration/org.eclipse.core.runtime
|
||||||
%{_datadir}/%{name}/configuration/org.eclipse.update
|
%{_datadir}/%{name}/configuration/org.eclipse.update
|
||||||
|
|
Loading…
Reference in New Issue