- Reenable webkit support, build is fixed.

This commit is contained in:
Alexander Kurtakov 2010-09-21 08:38:16 -04:00
parent c9e9487ffa
commit 8d1aaa59f7
1 changed files with 10 additions and 2 deletions

View File

@ -27,7 +27,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 12%{?dist}
Release: 13%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@ -193,9 +193,14 @@ sed -i -e "s|org.apache.ant_1.7.1.v20100518-1145/lib/ant-trax.jar=/usr/share/jav
sed -i -e "s|tomcat5-jsp-2.0-api|tomcat6-jsp-2.1-api|g" dependencies.properties
pushd build/eclipse-%{version}-src
%patch0
pushd plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library/
pushd plugins/org.eclipse.swt
pushd Eclipse\ SWT\ PI/gtk/library
sed -i -e "s|-lwebkit-1.0|\`pkg-config --libs webkit-1.0\`|g" make_linux.mak
popd
pushd Eclipse\ SWT\ Mozilla/common/library/
%patch1
popd
popd
# Use our system-installed javadocs, reference only what we built, and
# don't like to osgi.org docs (FIXME: maybe we should package them?)
@ -595,6 +600,9 @@ fi
%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
* Tue Sep 21 2010 Alexander Kurtakov <akurtako@redhat.com> 1:3.6.0-13
- Reenable webkit support, build is fixed.
* Tue Sep 21 2010 Alexander Kurtakov <akurtako@redhat.com> 1:3.6.0-12
- Disable webkit support - it is causing build failures.