Yet another fix for RHBZ#912664.

This commit is contained in:
Krzysztof Daniel 2013-02-20 10:13:21 +01:00
parent 2b71e0b459
commit d5ece62ff7

View File

@ -65,7 +65,7 @@ fi;
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_version}
Release: 0.9.git20121217%{?dist}
Release: 0.10.git20121217%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@ -952,11 +952,6 @@ echo "-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/d
echo -e "org.eclipse.equinox.p2.core/debug=true" > $RPM_BUILD_ROOT%{_libdir}/%{name}/.options
echo -e "org.eclipse.equinox.p2.core/reconciler=true" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/.options
# SWT JAR symlink in libdir
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
ln -s ../%{name}/swt.jar ../java/swt.jar
popd
# OSGI JAR symlinks in javadir and maven depmaps
pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.osgi_*.jar osgi.jar
@ -1321,6 +1316,9 @@ rm -rf %{_bindir}/efj/
%{_mavendepmapfragdir}/%{name}-equinox-osgi
%changelog
* Wed Feb 20 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.2-0.10.git20121217
- Yet another fix for RHBZ#912664.
* Tue Feb 19 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.2-0.9.git20121217
- Remove merge artifacts.