X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=eclipse-swt.spec;h=146546e683b3a4f57edbc28ea69bbd80e80986d8;hb=f1b45715037db48068168202c8067be6b5b8d909;hp=5a48d4dc0055862875da903a3df30e058991ad10;hpb=cc84b802c394bc123e3b4c551008a560a6254fbf;p=packages%2Feclipse-swt.git

diff --git a/eclipse-swt.spec b/eclipse-swt.spec
index 5a48d4d..146546e 100644
--- a/eclipse-swt.spec
+++ b/eclipse-swt.spec
@@ -1,41 +1,45 @@
 # NOTE
 # - build instructions: http://www.eclipse.org/swt/faq.php#howbuilddll
 #
+# TODO
+# - check if any patches are needed
+#
 # Conditional build:
 %bcond_without	gnome		# build without GNOME
 %bcond_without	xulrunner	# build without xulrunner
 %bcond_without	glx		# build without GLX
-%bcond_with	cairo		# build with cairo
+%bcond_without	cairo		# build without cairo
 
-%define	buildid		200710231652
+%define	buildid		201102101200
 
 %ifarch %{x8664}
-%define	swtsrcdir	plugins/org.eclipse.swt.gtk.linux.x86_64
+%define	swtsrcdir	src/plugins/org.eclipse.swt.gtk.linux.x86_64
 %define	swtgtkdir	plugins/org.eclipse.swt.gtk.linux.x86_64
 %endif
 
 %ifarch ppc
-%define swtsrcdir	plugins/org.eclipse.swt.gtk.linux.ppc
+%define swtsrcdir	src/plugins/org.eclipse.swt.gtk.linux.ppc
 %define swtgtkdir	plugins/org.eclipse.swt.gtk.linux.ppc
 %endif
 
 %ifarch %{ix86}
-%define swtsrcdir	plugins/org.eclipse.swt.gtk.linux.x86
+%define swtsrcdir	src/plugins/org.eclipse.swt.gtk.linux.x86
 %define swtgtkdir	plugins/org.eclipse.swt.gtk.linux.x86
 %endif
 
 %define	eclipse_arch	%(echo %{_target_cpu} | sed 's/i.86/x86/;s/athlon/x86/;s/pentium./x86/')
 
+%include	/usr/lib/rpm/macros.java
 Summary:	SWT - a widget toolkit for Java
 Summary(pl.UTF-8):	SWT - zestaw widgetów dla Javy
 Name:		eclipse-swt
-Version:	3.3.1.1
+Version:	3.6.2
 Release:	1
 License:	CPL v1.0
 Group:		Libraries
 Source0:	http://download.eclipse.org/eclipse/downloads/drops/R-%{version}-%{buildid}/eclipse-sourceBuild-srcIncluded-%{version}.zip
-# Source0-md5:	593b56fce7d1f1f799e87365cafefbef
-Patch0:		%{name}-NULL.patch
+# Source0-md5:	33a298ea33c6f24462aa0a02b9cda3d4
+Patch0:		eclipse-xpcom-h.patch
 URL:		http://www.eclipse.org/swt/
 %{?with_glx:BuildRequires:	OpenGL-devel}
 BuildRequires:	ant >= 1.6.1
@@ -46,13 +50,14 @@ BuildRequires:	jdk >= 1.4
 %{?with_gnome:BuildRequires:  libgnomeui-devel}
 %{?with_xulrunner:BuildRequires:	libstdc++-devel}
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.213
+BuildRequires:	rpm-javaprov
+BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	unzip
-%{?with_xulrunner:BuildRequires:	xulrunner-devel}
+BuildRequires:	xorg-lib-libXtst-devel
+%{?with_xulrunner:BuildRequires:	xulrunner-devel >= 1.9}
 BuildRequires:	zip
-Requires:	ant
 Requires:	jdk >= 1.4
-ExclusiveArch:	%{ix86} %{x8664} ppc
+Requires:	jpackage-utils
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -67,10 +72,6 @@ systemach operacyjnych, na których został zaimplementowany.
 
 %prep
 %setup -q -c
-%ifarch %{x8664}
-# probably broken only in 3.3.1.1
-%{__sed} -i -e 's,${basedir}/src/Eclipse SWT,${plugindir}/Eclipse SWT,' %{swtsrcdir}/build.xml
-%endif
 %ant -f %{swtsrcdir}/build.xml src.zip
 mkdir swt
 cd swt
@@ -83,7 +84,7 @@ cd swt
 	%{?with_glx:make_glx} \
 	%{?with_gnome:make_gnome} \
 	%{?with_cairo:make_cairo} \
-	%{?with_xulrunner:make_xulrunner XULRUNNER_INCLUDES="$(pkg-config --cflags xulrunner-xpcom)"} \
+	%{?with_xulrunner:make_xulrunner XULRUNNER_INCLUDES="$(pkg-config --cflags libxul-embedding)"} \
 	JAVA_HOME="%{java_home}" \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
@@ -105,10 +106,6 @@ for a in swt/libswt-*.so; do
 	ln -sf ${dir#%{_libdir}/swt/}/$lib $RPM_BUILD_ROOT%{_libdir}/swt
 done
 
-%if %{with cairo}
-install swt/libcairo.so* $RPM_BUILD_ROOT%{_libdir}/swt
-%endif
-
 install swt/*.html $RPM_BUILD_ROOT%{_libdir}/swt
 cp -a swt/about_files $RPM_BUILD_ROOT%{_libdir}/swt
 
@@ -119,17 +116,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %dir %{_libdir}/swt
 %dir %{_libdir}/swt/plugins
-%dir %{_libdir}/swt/%{swtgtkdir}_*.*.*
-%dir %{_libdir}/swt/%{swtgtkdir}_*.*.*/os
-%dir %{_libdir}/swt/%{swtgtkdir}_*.*.*/os/linux
-%dir %{_libdir}/swt/%{swtgtkdir}_*.*.*/os/linux/%{eclipse_arch}
+%dir %{_libdir}/swt/%{swtgtkdir}_%{version}
+%dir %{_libdir}/swt/%{swtgtkdir}_%{version}/os
+%dir %{_libdir}/swt/%{swtgtkdir}_%{version}/os/linux
+%dir %{_libdir}/swt/%{swtgtkdir}_%{version}/os/linux/%{eclipse_arch}
 %{_javadir}/swt.jar
 %{_libdir}/swt/about_files
 %{_libdir}/swt/about.html
 %{_libdir}/swt/libswt-*-*.so
-%attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_*.*.*/os/linux/%{eclipse_arch}/libswt-atk-gtk-*.so
-%{?with_glx:%attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_*.*.*/os/linux/%{eclipse_arch}/libswt-glx-gtk-*.so}
-%{?with_gnome:%attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_*.*.*/os/linux/%{eclipse_arch}/libswt-gnome-gtk-*.so}
-%attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_*.*.*/os/linux/%{eclipse_arch}/libswt-gtk-*.so
-%attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_*.*.*/os/linux/%{eclipse_arch}/libswt-pi-gtk-*.so
-%{?with_xulrunner:%attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_*.*.*/os/linux/%{eclipse_arch}/libswt-xulrunner-gtk-*.so}
+%attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_%{version}/os/linux/%{eclipse_arch}/libswt-atk-gtk-*.so
+%{?with_cairo:%attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_%{version}/os/linux/%{eclipse_arch}/libswt-cairo-gtk-*.so}
+%{?with_glx:%attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_%{version}/os/linux/%{eclipse_arch}/libswt-glx-gtk-*.so}
+%{?with_gnome:%attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_%{version}/os/linux/%{eclipse_arch}/libswt-gnome-gtk-*.so}
+%attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_%{version}/os/linux/%{eclipse_arch}/libswt-gtk-*.so
+%attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_%{version}/os/linux/%{eclipse_arch}/libswt-pi-gtk-*.so
+%{?with_xulrunner:%attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_%{version}/os/linux/%{eclipse_arch}/libswt-xulrunner-gtk-*.so}