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

diff --git a/eclipse.spec b/eclipse.spec
index fa70971..ed52a4e 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,5 +1,6 @@
 #
-%define		_buildid	200408122000
+%define		_buildid	200412162000
+%define		_build_date	20041216
 %define		_ver_major	3.1
 %define		_ver_minor	0
 %define		_ver		%{_ver_major}.%{_ver_minor}
@@ -8,21 +9,24 @@ Summary:	Eclipse - an open extensible IDE
 Summary(pl):	Eclipse - otwarte, rozszerzalne ¶rodowisko programistyczne
 Name:		eclipse
 Version:	%{_ver_major}
-Release:	0.M1_%{_buildid}.2
+Release:	0.M4_%{_buildid}.1
 License:	CPL v1.0
 Group:		Development/Tools
-Source0:	http://download.eclipse.org/downloads/drops/S-%{_ver_major}M1-%{_buildid}/eclipse-sourceBuild-srcIncluded-%{_ver_major}M1.zip
-# Source0-md5:	e2ed08cb88adc0262086a77c96ffa2b2
+Source0:	http://download.eclipse.org/downloads/drops/S-%{_ver_major}M4-%{_buildid}/eclipse-sourceBuild-srcIncluded-%{_ver_major}M4.zip
+# Source0-md5:	9d529492c9cac1add34e96192504ac22
 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
-%ifnarch amd64
-BuildRequires:	mozilla-devel
-%endif
+#BuildRequires:	mozilla-devel
+BuildRequires:	pkgconfig
 BuildRequires:	unzip
 BuildRequires:	zip
 Requires:	jakarta-ant
@@ -32,7 +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.
@@ -44,70 +50,80 @@ wszystkiego i niczego w szczeg
 
 %prep
 %setup -q -c
-%patch1 -p1
+%patch1 -p0
+%patch2 -p1
+%patch4 -p1
 
 %build
-JAVA_HOME=%{_prefix}/lib/java
+JAVA_HOME=%{_libdir}/java
 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	_swtgtkdir	plugins/org.eclipse.swt.gtk64
 %else
 %define	_swtsrcdir	plugins/org.eclipse.swt.gtk/ws/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
-ln -sf library/xpcom.cpp xpcom.cpp
+
+export JAVA_INC="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
+
 patch -p0 < %{PATCH0}
-%ifnarch amd64
-%{__make} -f make_gtk.mak all \
-%else
-# amd64: mozilla disabled
-%{__make} -f make_gtk.mak all64 \
-%endif
+patch -p0 < %{PATCH3}
+%{__make} -f make_linux.mak all \
+    XTEST_LIB_PATH=%{_prefix}/X11R6/%{_lib} \
     OPT="%{rpmcflags}"
+#cp library/* .
+#{__make} -f make_linux.mak make_mozilla \
+#    OPT="%{rpmcflags}"
 cd -
 
-JAVA_INC="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
-
+#mkdir plugins/org.eclipse.core.resources.linux/os/linux/%{_eclipse_arch}
 %{__make} -C plugins/org.eclipse.core.resources.linux/src \
-    CFLAGS="%{rpmcflags}" \
-    LDFLAGS="%{rpmldflags}" \
-    INC_PATH="$JAVA_INC"
+    CFLAGS="%{rpmcflags} $JAVA_INC" \
+    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} %{rpmldflags} -I. $JAVA_INC update.c -o libupdate.so -shared
+%{__cc} %{rpmcflags} -fPIC %{rpmldflags} -I. $JAVA_INC update.c -o libupdate.so -shared
 mv libupdate.so ../os/linux/%{_eclipse_arch}
 cd -
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_bindir},%{_datadir}/%{name}}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_bindir},%{_libdir}/%{name}}
+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/linux-gtk-%{_eclipse_arch}-sdk.zip -d $RPM_BUILD_ROOT%{_datadir}
+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
 install -d $RPM_BUILD_ROOT%{_bindir}
 cat > $RPM_BUILD_ROOT%{_bindir}/eclipse << EOF
 #!/bin/sh
-exec %{_datadir}/%{name}/eclipse \$*
+exec %{_libdir}/%{name}/eclipse \$*
 EOF
 
 cd swt
-install libswt-{atk-gtk,awt-gtk,gnome-gtk,gtk,pi-gtk}-*.so \
-    $RPM_BUILD_ROOT%{_datadir}/eclipse/plugins/org.eclipse.swt.gtk_%{_ver_major}.%{_ver_minor}/os/linux/%{_eclipse_arch}
-%ifnarch amd64
-install libswt-mozilla-gtk-*.so \
-    $RPM_BUILD_ROOT%{_datadir}/eclipse/plugins/org.eclipse.swt.gtk_%{_ver_major}.%{_ver_minor}/os/linux/%{_eclipse_arch}
-%endif
+#install libswt-{atk-gtk,awt-gtk,gnome-gtk,gtk,kde,pi-gtk}-*.so \
+install libswt-*.so \
+    $RPM_BUILD_ROOT%{_libdir}/eclipse/%{_swtgtkdir}_%{_ver_major}.%{_ver_minor}/os/linux/%{_eclipse_arch}
+#install libswt-mozilla-gtk-*.so \
+#    $RPM_BUILD_ROOT%{_libdir}/eclipse/%{_swtgtkdir}_%{_ver_major}.%{_ver_minor}/os/linux/%{_eclipse_arch}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -115,144 +131,143 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/eclipse
-%attr(755,root,root) %{_datadir}/%{name}/eclipse
+%attr(755,root,root) %{_libdir}/%{name}/eclipse
 %{_desktopdir}/eclipse.desktop
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/.eclipseproduct
-%{_datadir}/%{name}/configuration
-%{_datadir}/%{name}/icon.xpm
-%{_datadir}/%{name}/notice.html
-%{_datadir}/%{name}/readme
-%{_datadir}/%{name}/startup.jar
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/.eclipseproduct
+%{_libdir}/%{name}/configuration
+%{_libdir}/%{name}/icon.xpm
+%{_libdir}/%{name}/notice.html
+%{_libdir}/%{name}/readme
+%{_libdir}/%{name}/startup.jar
 
 # features
-%dir %{_datadir}/%{name}/features
-%{_datadir}/%{name}/features/org.eclipse.jdt_*.*.*
-%{_datadir}/%{name}/features/org.eclipse.jdt.source_*.*.*
-%{_datadir}/%{name}/features/org.eclipse.pde_*.*.*
-%{_datadir}/%{name}/features/org.eclipse.pde.source_*.*.*
-%{_datadir}/%{name}/features/org.eclipse.platform_*.*.*
-%{_datadir}/%{name}/features/org.eclipse.platform.source_*.*.*
-%{_datadir}/%{name}/features/org.eclipse.sdk_*.*.*
+%dir %{_libdir}/%{name}/features
+%{_libdir}/%{name}/features/org.eclipse.jdt_*.*.*
+%{_libdir}/%{name}/features/org.eclipse.jdt.source_*.*.*
+%{_libdir}/%{name}/features/org.eclipse.pde_*.*.*
+%{_libdir}/%{name}/features/org.eclipse.pde.source_*.*.*
+%{_libdir}/%{name}/features/org.eclipse.platform_*.*.*
+%{_libdir}/%{name}/features/org.eclipse.platform.source_*.*.*
+%{_libdir}/%{name}/features/org.eclipse.sdk_*.*.*
 
 # plugins
-%dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/org.apache.ant_*.*.*
-%{_datadir}/%{name}/plugins/org.apache.lucene_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.ant.core_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.ant.ui_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.compare_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.core.boot_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.core.expressions_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.core.filebuffers_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.core.resources_*.*.*
+%dir %{_libdir}/%{name}/plugins
+%{_libdir}/%{name}/plugins/org.apache.ant_*.*.*
+%{_libdir}/%{name}/plugins/org.apache.lucene_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ant.core_*.*.*
+%{_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.expressions_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.core.resources_*.*.*
 
-%dir %{_datadir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*
-%dir %{_datadir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os
-%dir %{_datadir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os/linux
-%dir %{_datadir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os/linux/%{_eclipse_arch}
-%attr(755,root,root) %{_datadir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os/linux/%{_eclipse_arch}/libcore_2_1_0b.so
-%{_datadir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/fragment.xml
+%dir %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*
+%dir %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os
+%dir %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os/linux
+%dir %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os/linux/%{_eclipse_arch}
+%attr(755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os/linux/%{_eclipse_arch}/libcore_3_1_0.so
+%{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/fragment.xml
 
-%{_datadir}/%{name}/plugins/org.eclipse.core.runtime_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.core.variables_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.debug.core_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.debug.ui_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.help_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.help.appserver_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.help.base_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.help.ide_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.help.ui_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.help.webapp_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.debug_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.debug.ui_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.isv_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.user_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.junit_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.launching_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.source_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.ui_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.jface_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.jface.text_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.osgi_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.osgi.services_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.osgi.util_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.pde_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.pde.build_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.pde.core_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.pde.doc.user_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.pde.junit.runtime_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.pde.runtime_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.pde.source_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.pde.ui_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.platform_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.platform.doc.isv_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.platform.doc.user_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.platform.source_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.%{_eclipse_arch}_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.sdk_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.search_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.swt_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.core.runtime_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.core.variables_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.debug.core_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.debug.ui_*.*.*
+%{_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.ui_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.help.webapp_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug.ui_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.isv_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.user_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.launching_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.source_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jface_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jface.text_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.osgi_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.osgi.services_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.osgi.util_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.pde_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.pde.build_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.pde.core_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.pde.doc.user_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.pde.junit.runtime_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.pde.source_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.pde.ui_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.platform_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.platform.doc.isv_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.platform.doc.user_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.platform.source_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.%{_eclipse_arch}_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.sdk_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.search_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.swt_*.*.*
 
-%dir %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*
-%dir %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/os
-%dir %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/os/linux
-%dir %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/os/linux/%{_eclipse_arch}
-%attr(755,root,root) %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/os/linux/%{_eclipse_arch}/libswt-atk-gtk-*.so
-%attr(755,root,root) %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/os/linux/%{_eclipse_arch}/libswt-awt-gtk-*.so
-%attr(755,root,root) %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/os/linux/%{_eclipse_arch}/libswt-gnome-gtk-*.so
-%attr(755,root,root) %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/os/linux/%{_eclipse_arch}/libswt-gtk-*.so
-%ifnarch amd64
-%attr(755,root,root) %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/os/linux/%{_eclipse_arch}/libswt-mozilla-gtk-*.so
-%endif
-%attr(755,root,root) %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/os/linux/%{_eclipse_arch}/libswt-pi-gtk-*.so
-%{_datadir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/ws
-%{_datadir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/META-INF
-%{_datadir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/about.html
-%{_datadir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/cpl-v10.html
-%{_datadir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/fragment.properties
-%{_datadir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/fragment.xml
-%{_datadir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/lgpl-v21.txt
-%{_datadir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/mpl-v11.txt
+%dir %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*
+%dir %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os
+%dir %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os/linux
+%dir %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}
+%attr(755,root,root) %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-atk-gtk-*.so
+%attr(755,root,root) %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-awt-gtk-*.so
+%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-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
 
-%{_datadir}/%{name}/plugins/org.eclipse.team.core_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ssh_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ui_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.team.ui_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.text_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.tomcat_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.ui_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.cheatsheets_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.console_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.editors_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.externaltools_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.forms_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.ide_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.intro_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.presentations.r21_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.views_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench.compatibility_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.update.configurator_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.update.core_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.team.core_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ui_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.team.ui_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.text_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.tomcat_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.cheatsheets_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.console_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.editors_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.externaltools_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.forms_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.ide_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.intro_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.presentations.r21_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.views_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.compatibility_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.update.configurator_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.update.core_*.*.*
 
-%dir %{_datadir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*
-%dir %{_datadir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/os
-%dir %{_datadir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/os/linux
-%dir %{_datadir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/os/linux/%{_eclipse_arch}
-%attr(755,root,root) %{_datadir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/os/linux/%{_eclipse_arch}/libupdate.so
-%{_datadir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/about.html
-%{_datadir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/fragment.xml
+%dir %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*
+%dir %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/os
+%dir %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/os/linux
+%dir %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/os/linux/%{_eclipse_arch}
+%attr(755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/os/linux/%{_eclipse_arch}/libupdate.so
+%{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/about.html
+%{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/fragment.xml
 
-%{_datadir}/%{name}/plugins/org.eclipse.update.scheduler_*.*.*
-%{_datadir}/%{name}/plugins/org.eclipse.update.ui_*.*.*
-%{_datadir}/%{name}/plugins/org.junit_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.update.scheduler_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.update.ui_*.*.*
+%{_libdir}/%{name}/plugins/org.junit_*.*.*