[eclipse] Update eclipse-build snapshot, organise patches
mbooth
mbooth at fedoraproject.org
Wed Apr 2 09:30:51 UTC 2014
commit fa7a0c9e172e11052bae9ede071fb5717a886da3
Author: Mat Booth <mat.booth at redhat.com>
Date: Wed Apr 2 10:07:15 2014 +0100
Update eclipse-build snapshot, organise patches
eclipse.spec | 75 +++++++++++++++++++++++++++++----------------------------
sources | 2 +-
2 files changed, 39 insertions(+), 38 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index c480b44..31bd8e1 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -15,7 +15,7 @@ Epoch: 1
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
%global eclipse_micro 0
%global initialize 1
-%global eb_commit 10b193b0f225b307353a892050993d0ebb1da6f9
+%global eb_commit d30ddf2f70e6795bc9ee080a3d4cbb46143c0371
%global eclipse_tag I20140401-1500
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
%global installation_loc %{_libdir}/%{pkg_name}
@@ -55,7 +55,7 @@ fi;
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
-Release: 0.2%{?dist}
+Release: 0.3.git201404011500%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@@ -82,52 +82,52 @@ Patch2: %{pkg_name}-no-source-for-dependencies.patch
Patch3: %{pkg_name}-remove-weaving.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=377515
-Patch6: %{pkg_name}-p2-pick-up-renamed-jars.patch
+Patch4: %{pkg_name}-p2-pick-up-renamed-jars.patch
# Patch for this was contributed. Unlikely to be released.
-Patch7: %{pkg_name}-ignore-version-when-calculating-home.patch
+Patch5: %{pkg_name}-ignore-version-when-calculating-home.patch
# CBI uses timestamps generated from the git commits. We don't have the repo,
# just source, and we don't want additional dependencies.
-Patch8: %{pkg_name}-remove-jgit-provider.patch
+Patch6: %{pkg_name}-remove-jgit-provider.patch
# This is for Fedora purposes to have working eclipse-pdebuild script.
-Patch9: %{pkg_name}-pdebuild-add-target.patch
+Patch7: %{pkg_name}-pdebuild-add-target.patch
# Strict Fedora purpose, too. We can't build entire product, just base
# and JDT and SDK as update sites, then we can assemble our own packages.
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=386670
# additional poms are a part of e-b
-Patch10: %{pkg_name}-change-build-packagings.patch
+Patch8: %{pkg_name}-change-build-packagings.patch
-Patch11: %{pkg_name}-test-support.patch
+Patch9: %{pkg_name}-test-support.patch
-Patch12: %{pkg_name}-secondary-arches.patch
+Patch10: %{pkg_name}-secondary-arches.patch
-Patch13: %{pkg_name}-debug-symbols.patch
+Patch11: %{pkg_name}-debug-symbols.patch
-Patch14: %{pkg_name}-fix-comaptibility-class.patch
+Patch12: %{pkg_name}-fix-comaptibility-class.patch
-Patch15: %{pkg_name}-fix-swt-build-in-rawhide.patch
+Patch13: %{pkg_name}-fix-swt-build-in-rawhide.patch
-Patch16: %{pkg_name}-bug-903537.patch
+Patch14: %{pkg_name}-bug-903537.patch
-Patch17: %{pkg_name}-jetty-9.patch
+Patch15: %{pkg_name}-jetty-9.patch
-Patch18: %{pkg_name}-fix-startup-class-refresh.patch
+Patch16: %{pkg_name}-fix-startup-class-refresh.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=408138
-Patch19: %{pkg_name}-fix-dropins.patch
+Patch17: %{pkg_name}-fix-dropins.patch
-Patch21: %{pkg_name}-bug-386377.patch
-Patch22: %{pkg_name}-servlet-3.1.patch
-Patch23: %{pkg_name}-lucene-4.patch
-Patch24: %{pkg_name}-no-target-platform.patch
+Patch18: %{pkg_name}-bug-386377.patch
+Patch19: %{pkg_name}-servlet-3.1.patch
+Patch20: %{pkg_name}-lucene-4.patch
+Patch21: %{pkg_name}-no-target-platform.patch
# org.mockito -> org.mockito.mockito-core
-Patch25: %{pkg_name}-mockito.patch
+Patch22: %{pkg_name}-mockito.patch
-Patch26: %{pkg_name}-policy-comparators.patch
+Patch23: %{pkg_name}-policy-comparators.patch
BuildRequires: ant >= 1.8.3
BuildRequires: rsync
@@ -317,28 +317,28 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch1
%patch2
%patch3
+%patch4
+%patch5
%patch6
%patch7
%patch8
%patch9
-%patch10
+%patch10 -p1
%patch11
-%patch12 -p1
+%patch12
%patch13
%patch14
-%patch15
+%{!?scl:%patch15}
%patch16
-%{!?scl:%patch17}
-%patch18
-%patch19
+%patch17
pushd rt.equinox.framework
-%patch21 -p1
+%patch18 -p1
popd
+%patch19
+%patch20 -p1
+%patch21
%patch22
-%patch23 -p1
-%patch24
-%patch25
-%patch26
+%patch23
#Disable as many things as possible to make the build faster. We care only for Eclipse.
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
@@ -494,8 +494,6 @@ xmvn -o clean verify \
-Dtargets=install
#symlink necessary plugins (that are provided by other packages)
-sed -i -e '27i _symlink org.objectweb.asm.all_ objectweb-asm/asm-all.jar' \
- dependencies/replace_platform_plugins_with_symlinks.sh
dependencies/replace_platform_plugins_with_symlinks.sh \
eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse %{_javadir}
#ant again
@@ -1023,11 +1021,14 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
%changelog
-* Tue Apr 01 2014 Mat Booth <mat.booth at redhat.com> - 1:4.4.0-0.2
+* Wed Apr 02 2014 Mat Booth <mat.booth at redhat.com> - 1:4.4.0-0.3.git201404011500
+- Update eclipse-build snapshot
+
+* Tue Apr 01 2014 Mat Booth <mat.booth at redhat.com> - 1:4.4.0-0.2.git201404011500
- Update to latest I-build of Luna 4.4.0
- Require objectweb-asm >= 5.0.1
-* Mon Mar 24 2014 Mat Booth <fedora at matbooth.co.uk> - 1:4.4.0-0.1
+* Mon Mar 24 2014 Mat Booth <mat.booth at redhat.com> - 1:4.4.0-0.1.M6
- Update to M6 pre-release of Luna 4.4.0
- Bootstrap build
- Drop upstreamed patches: do-not-run-as-root, bug-408505,
diff --git a/sources b/sources
index a515f3d..8025881 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ffe1d5aacf43506dae81a422d4f88256 org.eclipse.linuxtools.eclipse-build-10b193b0f225b307353a892050993d0ebb1da6f9.tar.bz2
+c7b7979cea9a7a5995f5405cf1684744 org.eclipse.linuxtools.eclipse-build-d30ddf2f70e6795bc9ee080a3d4cbb46143c0371.tar.bz2
a4727549f2b739c005cb6b7324691014 R4_platform-aggregator-I20140401-1500.tar.xz
More information about the scm-commits
mailing list