[eclipse] - Fix copy-platform script generation.
jerboaa
jerboaa at fedoraproject.org
Fri Oct 1 13:06:17 UTC 2010
commit 6b49ff7c80f82ad965ed4f91633841b47d832e6e
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date: Thu Sep 30 18:06:21 2010 -0400
- Fix copy-platform script generation.
eclipse.spec | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index f57cfbd..c2a1acd 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -27,7 +27,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 15%{?dist}
+Release: 16%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -263,9 +263,6 @@ ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -Dmultilib=true installSDKinDropins
# https://bugs.eclipse.org/292472
rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/icon.xpm
-# This symlink is actually provided by the icu4j-eclipse package
-rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/com.ibm.icu_*.jar
-
# Set GDK_NATIVE_WINDOWS=true
# https://bugzilla.redhat.com/531675 (https://bugs.eclipse.org/290395)
rm $RPM_BUILD_ROOT/%{_bindir}/%{name}
@@ -331,6 +328,12 @@ sed -e's,^\(.*\),[ ! -e \1 ] \&\& ln -s $eclipse/\1 \1,' >> copy-platform
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts
mv copy-platform $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts
copyPlatform=$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/copy-platform
+
+# This symlink is actually provided by the icu4j-eclipse package
+# We need to remove this *after* copy-platform creation otherwise
+# copy-platform gets generated wrong.
+rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/com.ibm.icu_*.jar
+
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
for p in $(ls -d dropins/jdt/plugins/*); do
plugin=$(basename $p)
@@ -605,8 +608,11 @@ fi
%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
+* Thu Sep 30 2010 Severin Gehwolf <sgehwolf at redhat.com> 1:3.6.0-16
+- Fix copy-platform script generation.
+
* Mon Sep 27 2010 Severin Gehwolf <sgehwolf at redhat.com> 1:3.6.0-15
-- Add shell script portability patch for prepare-build-dir.sh
+- Add shell script portability patch for prepare-build-dir.sh.
* Tue Sep 21 2010 Alexander Kurtakov <akurtako at redhat.com> 1:3.6.0-14
- Really reenable webkit.
More information about the scm-commits
mailing list