diff --git a/eclipse-target-platform-template.patch b/eclipse-target-platform-template.patch new file mode 100644 index 0000000..6e71e85 --- /dev/null +++ b/eclipse-target-platform-template.patch @@ -0,0 +1,22 @@ +--- plugins/org.eclipse.pde.core/targets/rcpWithSource.target.old 2009-09-09 20:58:19.915548076 +0100 ++++ plugins/org.eclipse.pde.core/targets/rcpWithSource.target 2009-09-09 21:03:43.845541597 +0100 +@@ -3,15 +3,9 @@ + + + +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ + + diff --git a/eclipse.spec b/eclipse.spec index f9837bb..9bd6a49 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -30,7 +30,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 0.9%{?dist} +Release: 0.10%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -127,6 +127,11 @@ Patch48: %{name}-swt-buildagainstxulrunner.patch Patch49: %{name}-add-ppc64-filesystem.patch +# Make sure the shipped target platform templates are looking in the +# correct location for source bundles (see RHBZ # 521969). This does not +# need to go upstream. +Patch50: %{name}-target-platform-template.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant BuildRequires: jpackage-utils >= 0:1.5, make, gcc @@ -637,6 +642,9 @@ fi #%patch48 -p3 #popd +# target platform template patch +%patch50 -p0 + sed -i -e 's|org.eclipse.ecf;bundle-version="1.2.0",|org.eclipse.ecf;bundle-version="[3.0.0,4.0.0)",|' \ -e 's|org.eclipse.ecf.filetransfer;bundle-version="2.0.0",|org.eclipse.ecf.filetransfer;bundle-version="[3.0.0,4.0.0)",|' \ plugins/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF @@ -1405,6 +1413,10 @@ fi #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source %changelog +* Wed Sep 09 2009 Mat Booth 1:3.5.0-0.10 +- Patch the target platform templates so they find all the required + source bundles (see RHBZ # 521969). + * Mon Aug 31 2009 Alexander Kurtakov 1:3.5.0-0.9 - Remove all testframework sources, patches, build and etc.