diff --git a/eclipse.spec b/eclipse.spec index 940b2ee..8fac563 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -55,7 +55,7 @@ fi; Summary: An open, extensible IDE Name: %{?scl_prefix}eclipse Version: %{eclipse_version} -Release: 0.12.git201301281400%{?dist} +Release: 0.13.git201301281400%{?dist} License: EPL Group: Development/Tools URL: http://www.eclipse.org/ @@ -134,6 +134,8 @@ Patch20: %{pkg_name}-fix-comaptibility-class.patch Patch21: %{pkg_name}-fix-swt-build-in-rawhide.patch +Patch22: %{pkg_name}-bug-903537.patch + BuildRequires: ant >= 1.8.3 BuildRequires: rsync BuildRequires: jpackage-utils >= 0:1.5, make, gcc @@ -346,6 +348,7 @@ tar --strip-components=1 -xf %{SOURCE1} %patch19 %patch20 %patch21 +%patch22 #Disable as many things as possible to make the build faster. We care only for Eclipse. %pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder @@ -649,7 +652,8 @@ zip -r "../${SWT_JAR}.jar" * popd ln -s %{_libdir}/%{pkg_name}/plugins/"${SWT_JAR}.jar" swt.jar ln -s %{_libdir}/%{pkg_name}/plugins/"${SWT_JAR}.jar" swt-gtk.jar - ln -s ../%{pkg_name}/swt.jar ../java/swt.jar + mkdir -p ../../lib/java + ln -s ../%{pkg_name}/swt.jar ../../lib/java/swt.jar popd #eclipse ini @@ -779,7 +783,7 @@ echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{ %{_libdir}/%{pkg_name}/plugins/org.eclipse.swt.gtk.linux.* %{_libdir}/%{pkg_name}/swt-gtk*.jar %{_libdir}/%{pkg_name}/swt.jar -%{_libdir}/java/swt.jar +%{_usr}/lib/java/swt.jar %files platform -f .mfiles-platform @@ -1017,6 +1021,10 @@ echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{ %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_* %changelog +* Tue Feb 19 2013 Krzysztof Daniel 1:4.3.0-0.13.git201301281400 +- RHBZ#912664 - eclipse-swt should put swt.jar into /usr/lib/java even on 64 bit systems. +- RHBZ#903537 - [abrt] java-1.7.0-openjdk-1.7.0.9-2.3.4.fc18: gtk_widget_real_map (SIGABRT) + * Tue Feb 12 2013 Krzysztof Daniel 1:4.3.0-0.12.git201301281400 - Build support for GTK2 and GTK3 together.