- Remove SWT JNI symlinks from %%{libdir}.

This commit is contained in:
Ben Konrath 2007-01-11 22:28:18 +00:00
parent 8342665f19
commit c0c23311fa

View File

@ -19,7 +19,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 28%{?dist}
Release: 29%{?dist}
License: Eclipse Public License
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@ -1037,13 +1037,6 @@ for id in `ls configuration/org.eclipse.osgi/bundles`; do
done
popd
# Install symlinks to the SWT JNI shared libraries in /usr/lib
pushd $RPM_BUILD_ROOT%{_libdir}
for lib in $(find %{name}/configuration -name libswt\*.so); do
ln -s %{_libdir}/$lib `basename $lib`
done
popd
# Install the SWT symlinks in libdir
SWTJARVERSION=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
@ -1441,10 +1434,8 @@ fi
%dir %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles
%{_datadir}/%{name}/plugins/org.eclipse.swt_*
%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_*
%{_libdir}/libswt-*.so
# FIXME: do we need to build?
#%{_libdir}/%{name}/libcairo-swt.so
#%{_libdir}/libcairo-swt.so
%{_libdir}/%{name}/swt-gtk*.jar
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
@ -1738,6 +1729,9 @@ fi
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
%changelog
* Thu Jan 11 2007 Ben Konrath <bkonrath@redhat.com> 3.2.1-29
- Remove SWT JNI symlinks from %%{libdir}.
* Wed Jan 10 2007 Ben Konrath <bkonrath@redhat.com> 3.2.1-28
- Rpmlint cleanups.