X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=eclipse.spec;h=ed52a4ee1612cf12efe7b5e040a9fd65b1b62875;hb=59566f52c1b1562dc3c0346354dd38dbebfa46fc;hp=cad4684853eefa94c2679fdc3a3a6bde19a858e8;hpb=2dac16e9050115e61e194504b9001bd77bee11e5;p=packages%2Feclipse.git

diff --git a/eclipse.spec b/eclipse.spec
index cad4684..ed52a4e 100644
--- 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
@@ -47,6 +51,8 @@ wszystkiego i niczego w szczeg
 %prep
 %setup -q -c
 %patch1 -p0
+%patch2 -p1
+%patch4 -p1
 
 %build
 JAVA_HOME=%{_libdir}/java
@@ -71,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}"