From 124ed83b372fbc082a13bfa89d84e116db8fd8e0 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Sep 21 2011 09:27:06 +0000 Subject: Remove _bindir/efj in pre - Fixes #738677 --- diff --git a/eclipse.spec b/eclipse.spec index 78a8753..5b3eefb 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -16,7 +16,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 3%{?dist} +Release: 4%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -286,8 +286,7 @@ fi %pre jdt # workaround for rpm bug, can be removed in F-20 Fixes the problem with efj being directory instead of launcher -[ $1 -gt 1 ] && [ -L %{_bindir}/efj ] && \ -rm -rf $(readlink -f %{_bindir}/efj) %{_bindir}/efj || : +rm -rf %{_bindir}/efj/ %if %{initialize} %files swt -f %{name}-swt.install @@ -524,6 +523,9 @@ rm -rf $(readlink -f %{_bindir}/efj) %{_bindir}/efj || : %{_libdir}/%{name}/dropins/sdk %changelog +* Wed Sep 21 2011 Alexander Kurtakov 1:3.7.0-4 +- Remove _bindir/efj in pre - Fixes #738677. + * Mon Sep 12 2011 Alexander Kurtakov 1:3.7.0-3 - Use latest eclipse-build snapshot - fixes openjdk 7 build. - Fix efj launcher script.