- updated; builds

Changed files:
    eclipse.spec -> 1.41

diff --git a/eclipse.spec b/eclipse.spec
index c1948bc364d902fe0e053478defa309a10138f81..8c4df0cd65d236455b40c2853b691063957e13a4 100644 (file)
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -20,6 +20,7 @@ Patch0:               %{name}-swt-makefile.patch
 Patch1:                %{name}-core_resources-makefile.patch
 Patch2:                %{name}-jikesbuild.patch
 Patch3:                %{name}-swt-NULL.patch
+Patch4:                %{name}-string.patch
 URL:           http://www.eclipse.org/
 BuildRequires: jakarta-ant >= 1.6.1
 BuildRequires: jdk >= 1.4
@@ -36,9 +37,11 @@ ExclusiveArch:       %{ix86} ppc amd64
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _eclipse_arch   %(echo %{_target_cpu} | sed 's/i.86/x86/;s/athlon/x86/;s/pentium./x86/')
+%define                no_install_post_chrpath         1
 %ifarch amd64
 %define         _noautostrip   .*\\.so
 %endif
+
 %description
 Eclipse is a kind of universal tool platform - an open extensible IDE
 for anything and nothing in particular.
@@ -52,6 +55,8 @@ wszystkiego i niczego w szczeg
 %setup -q -c
 %patch1 -p0
 %patch2 -p1
+# Patch3 is used below in build section
+%patch4 -p1
 
 %build
 JAVA_HOME=%{_libdir}/java
@@ -59,31 +64,31 @@ export JAVA_HOME
 ./build -os linux -ws gtk -arch %{_eclipse_arch} -target compile
 
 %ifarch amd64
-%define        _swtsrcdir      plugins/org.eclipse.swt.gtk64/ws/gtk
+%define        _swtsrcdir      plugins/org.eclipse.swt.gtk64
 %define        _swtgtkdir      plugins/org.eclipse.swt.gtk64
 %else
-%define        _swtsrcdir      plugins/org.eclipse.swt.gtk/ws/gtk
+%define        _swtsrcdir      plugins/org.eclipse.swt.gtk
 %define        _swtgtkdir      plugins/org.eclipse.swt.gtk
 %endif
 
 rm -rf swt
 mkdir swt && cd swt
 
-unzip -x %{_builddir}/%{name}-%{version}/%{_swtsrcdir}/swtsrc.zip
-unzip -x %{_builddir}/%{name}-%{version}/%{_swtsrcdir}/swt-pisrc.zip
-unzip -x %{_builddir}/%{name}-%{version}/%{_swtsrcdir}/swt-mozillasrc.zip
+unzip -x %{_builddir}/%{name}-%{version}/%{_swtsrcdir}/src.zip
 
 export JAVA_INC="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
 
 patch -p0 < %{PATCH0}
 patch -p0 < %{PATCH3}
 %{__make} -f make_linux.mak all \
+    CC="%{__cc}" \
+    CXX="%{__cxx}" \
     XTEST_LIB_PATH=%{_prefix}/X11R6/%{_lib} \
     OPT="%{rpmcflags}"
 #cp library/* .
 #{__make} -f make_linux.mak make_mozilla \
 #    OPT="%{rpmcflags}"
-cd -
+cd ..
 
 #mkdir plugins/org.eclipse.core.resources.linux/os/linux/%{_eclipse_arch}
 %{__make} -C plugins/org.eclipse.core.resources.linux/src \
@@ -107,7 +112,7 @@ install -d $RPM_BUILD_ROOT%{_libdir}/eclipse/%{_swtgtkdir}_3.1.0/os/linux/%{_ecl
 
 ./build -os linux -ws gtk -arch %{_eclipse_arch} -target install
 
-unzip result/org.eclipse.sdk-I%{_build_date}-2000-linux.gtk.%{_eclipse_arch}.zip -d $RPM_BUILD_ROOT%{_libdir}
+tar xfz result/org.eclipse.sdk-I*-linux.gtk.%{_eclipse_arch}.tar.gz -C $RPM_BUILD_ROOT%{_libdir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
 #wrapper
@@ -158,9 +163,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/plugins/org.eclipse.ant.ui_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.compare_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.boot_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.core.commands_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.expressions_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.resources_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.core.resources.compatibility_*.*.*
 
 %dir %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*
 %dir %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os
@@ -177,7 +184,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/plugins/org.eclipse.help_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.help.appserver_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.help.base_*.*.*
-%{_libdir}/%{name}/plugins/org.eclipse.help.ide_*.*.*
+#%{_libdir}/%{name}/plugins/org.eclipse.help.ide_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.help.ui_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt_*.*.*
@@ -214,6 +221,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.search_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.swt_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.browser_*.*.*
 
 %dir %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*
 %dir %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os
@@ -224,16 +232,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-gnome-gtk-*.so
 %attr(755,root,root) %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-gtk-*.so
 %attr(755,root,root) %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-kde-gtk*.so
-%attr(755,root,root) %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-mozilla-gtk-*.so
+#%attr(755,root,root) %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-mozilla-gtk-*.so
 %attr(755,root,root) %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-pi-gtk-*.so
-%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/ws
-%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/META-INF
-%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/about.html
-%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/cpl-v10.html
-%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/fragment.properties
-%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/fragment.xml
-%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/lgpl-v21.txt
-%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/mpl-v11.txt
+#%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/ws
+#%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/META-INF
+#%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/about.html
+#%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/cpl-v10.html
+#%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/fragment.properties
+#%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/fragment.xml
+#%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/lgpl-v21.txt
+#%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/mpl-v11.txt
 
 %{_libdir}/%{name}/plugins/org.eclipse.team.core_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_*.*.*