- three "make me build" patches

[packages/eclipse.git] / eclipse.spec

diff --git a/eclipse.spec b/eclipse.spec
index b4358952d22f0f27843a80ba28e4ebc3ee160c43..ed52a4ee1612cf12efe7b5e040a9fd65b1b62875 100644 (file)
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -17,12 +17,16 @@ Source0:    http://download.eclipse.org/downloads/drops/S-%{_ver_major}M4-%{_buildi
 Source1:       %{name}.desktop
 Patch0:                %{name}-swt-makefile.patch
 Patch1:                %{name}-core_resources-makefile.patch
+Patch2:                %{name}-jikesbuild.patch
+Patch3:                %{name}-swt-NULL.patch
+Patch4:                %{name}-NULL.patch
 URL:           http://www.eclipse.org/
 BuildRequires: jakarta-ant >= 1.6.1
 BuildRequires: jdk >= 1.4
 BuildRequires: kdelibs-devel
 BuildRequires: libgnomeui-devel
 #BuildRequires:        mozilla-devel
+BuildRequires: pkgconfig
 BuildRequires: unzip
 BuildRequires: zip
 Requires:      jakarta-ant
@@ -32,8 +36,9 @@ 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/')
+%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.
@@ -46,6 +51,8 @@ wszystkiego i niczego w szczeg
 %prep
 %setup -q -c
 %patch1 -p0
+%patch2 -p1
+%patch4 -p1
 
 %build
 JAVA_HOME=%{_libdir}/java
@@ -70,6 +77,7 @@ unzip -x %{_builddir}/%{name}-%{version}/%{_swtsrcdir}/swt-mozillasrc.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 \
     XTEST_LIB_PATH=%{_prefix}/X11R6/%{_lib} \
     OPT="%{rpmcflags}"
@@ -84,7 +92,10 @@ cd -
     LDFLAGS="%{rpmldflags}"
 mv plugins/org.eclipse.core.resources.linux/{src/libcore*.so,os/linux/%{_eclipse_arch}}
 
+%ifarch amd64
 mkdir plugins/org.eclipse.update.core.linux/os/linux/%{_eclipse_arch}
+%endif
+
 cd plugins/org.eclipse.update.core.linux/src
 %{__cc} %{rpmcflags} -fPIC %{rpmldflags} -I. $JAVA_INC update.c -o libupdate.so -shared
 mv libupdate.so ../os/linux/%{_eclipse_arch}
@@ -93,11 +104,11 @@ cd -
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_bindir},%{_libdir}/%{name}}
-install -d $RPM_BUILD_ROOT%{_libdir}/eclipse/%{_swtgtkdir}_3.1.0/os/linux/amd64
+install -d $RPM_BUILD_ROOT%{_libdir}/eclipse/%{_swtgtkdir}_3.1.0/os/linux/%{_eclipse_arch}
 
 ./build -os linux -ws gtk -arch %{_eclipse_arch} -target install
 
-unzip result/org.eclipse.sdk-I%{_build_date}-2000-linux.gtk.amd64.zip -d $RPM_BUILD_ROOT%{_libdir}
+unzip result/org.eclipse.sdk-I%{_build_date}-2000-linux.gtk.%{_eclipse_arch}.zip -d $RPM_BUILD_ROOT%{_libdir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
 #wrapper