rpms/eclipse/devel eclipse.spec,1.681,1.682
Alexander Kurtakov
akurtakov at fedoraproject.org
Thu Oct 22 09:49:41 UTC 2009
- Previous message: rpms/mythes-fr/devel .cvsignore, 1.2, 1.3 mythes-fr.spec, 1.5, 1.6 sources, 1.2, 1.3
- Next message: rpms/kernel/F-12 drm-fix-palette.patch, NONE, 1.1 kernel.spec, 1.1876, 1.1877
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: akurtakov
Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6408/devel
Modified Files:
eclipse.spec
Log Message:
Remove ppc64 files copying and sedding. Supported by eclipse-build now.
Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.681
retrieving revision 1.682
diff -u -p -r1.681 -r1.682
--- eclipse.spec 20 Oct 2009 07:26:24 -0000 1.681
+++ eclipse.spec 22 Oct 2009 09:49:41 -0000 1.682
@@ -30,7 +30,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 10%{?dist}
+Release: 11%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -211,10 +211,6 @@ sed -i -e "s|http://java.sun.com/j2se/1.
find -iname \*.sf | xargs rm
find -iname \*.rsa | xargs rm
-# Remove existing .sos and binary launcher
-find -name \*.so | xargs rm
-find features/org.eclipse.equinox.executable -type f -name eclipse | xargs rm
-
# FIXME: do this as part of Linux distros project
#
# the swt version is set to HEAD on s390x but shouldn't be
@@ -227,37 +223,6 @@ swt_frag_ver_s390x=$(grep "version\.suff
sed --in-place "s|$swt_frag_ver_s390x|$swt_frag_ver|g" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml \
plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
-# Copy all of the s390x directories and files to ppc64 or sparc{,64} or alpha dirs and replace
-# the s390x strings with ppc64, etc.
-%ifnarch %{ix86} x86_64
- cp -rp features/org.eclipse.platform/about_files/linux.gtk.{x86,%{_arch}}
-%endif
-%ifarch ppc64 sparc sparcv9 sparc64 alpha
- for f in $(find -name \*s390x\* ); do
- tofile=$(echo $f | sed "s/s390x/%{_arch}/")
- cp -rp $f $tofile
- for g in $(find $tofile -type f); do
- sed -i "s/s390x/%{_arch}/g" $g
- done
- done
- mv buildConfigs/eclipse-build-config/build.properties buildConfigs/eclipse-build-config/build.properties.java
- OLDIFS=$IFS
-IFS='
-'
- for f in $(find -type f ! -name \*.java -a ! -name feature.xml -a ! -name \*.gif \
- -a ! -name \*.png -a ! -name \*.htm* -a ! -name \*.jar -a ! -name \
- \*.exe -a ! -name \*.pm -a ! -name \*.jpg -a ! -name \*win32\* | grep -v win32); do
- sed -i -e "s/s390x/%{_arch}/g" $f
- done
- IFS=$OLDIFS
-
- mv buildConfigs/eclipse-build-config/build.properties.java buildConfigs/eclipse-build-config/build.properties
- sed -i -e "s|contributed/gtk/linux/ppc64|bin/gtk/linux/ppc64|g" buildConfigs/eclipse-build-config/productFiles/rcpConfig/build.properties
- sed -i -e "s|s390x|%{_arch}|" features/org.eclipse.rcp/feature.xml
- sed -i -e "s/%{_arch}/s390x/g" plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
- sed -i -e "s/%{_arch}/s390x/g" plugins/org.eclipse.equinox.launcher.gtk.linux.s390x/META-INF/MANIFEST.MF
-%endif
-
%if ! %{bootstrap}
# Symlinks
rm plugins/org.sat4j*
@@ -1120,6 +1085,9 @@ fi
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
+* Thu Oct 22 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-11
+- Remove ppc64 files copying and sedding. Supported by eclipse-build now.
+
* Tue Oct 20 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-10
- Remove old/not needed BR/Rs.
- Previous message: rpms/mythes-fr/devel .cvsignore, 1.2, 1.3 mythes-fr.spec, 1.5, 1.6 sources, 1.2, 1.3
- Next message: rpms/kernel/F-12 drm-fix-palette.patch, NONE, 1.1 kernel.spec, 1.1876, 1.1877
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list