diff --git a/eclipse.spec b/eclipse.spec index 3d375d9..87aa536 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -92,6 +92,8 @@ Patch22: %{name}-welcome-screen.patch Patch25: %{name}-webappcpfix.patch Patch26: %{name}-webappcompiler.patch Patch27: %{name}-textsearch.patch +Patch28: %{name}-swtbuild.patch +Patch29: %{name}-launcher.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: ant @@ -218,6 +220,8 @@ popd %endif %patch26 -p0 %patch27 -p0 +%patch28 -p0 +%patch29 -p0 # Red Hat splash screen. pushd plugins/org.eclipse.platform @@ -341,6 +345,7 @@ mkdir -p './JNI Generation/org/eclipse/swt/tools/internal/' suff= %ifarch alpha ia64 ppc64 sparc64 x86_64 +echo "gtk64" suff=.gtk64 %endif @@ -440,7 +445,7 @@ find result -type f -name "*.zip" -exec unzip -d $RPM_BUILD_ROOT%{_datadir} {} \ install -m 644 plugins/org.eclipse.platform/startup.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/startup.jar rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.platform_*/startup.jar -install -m 644 plugins/platform-launcher/bin/gtk/linux/%{eclipse_arch}/icon.xpm $RPM_BUILD_ROOT%{_datadir}/%{name}/icon.xpm +install -m 644 plugins/platform-launcher/bin/gtk/linux/x86/icon.xpm $RPM_BUILD_ROOT%{_datadir}/%{name}/icon.xpm # binaries and libs install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name} @@ -673,6 +678,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Wed Jan 12 2005 Andrew Overholt 3.1-0.M4.8 - add ppc +- add launcher and swt patches * Wed Jan 12 2005 Andrew Overholt 3.1-0.M4.7 - make jdtcore*.jar part of eclipse-ecj