rpms/eclipse
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Organise patches

Browse Source
This commit is contained in:
Mat Booth 2015-04-01 15:44:23 +01:00
parent 30a4fac51d
commit da24e3513b
1 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
eclipse.spec
View File

@ -37,7 +37,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
Release: 0.11.git201503310800%{?dist}
Release: 0.12.git201503310800%{?dist}
License: EPL
URL: http://www.eclipse.org/
@ -45,62 +45,62 @@ URL: http://www.eclipse.org/
Source0: R4_platform-aggregator-%{eclipse_tag}.tar.xz
Source1: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/snapshot/org.eclipse.linuxtools.eclipse-build-%{eb_commit}.tar.bz2
Patch1: %{pkg_name}-remove-w3c-smil-and-use-geronimo.patch
Patch0: %{pkg_name}-remove-w3c-smil-and-use-geronimo.patch
# Eclipse should not include source for dependencies that are not supplied by this package
# and should not include source for bundles that are not relevant to our platform
Patch2: %{pkg_name}-no-source-for-dependencies.patch
Patch1: %{pkg_name}-no-source-for-dependencies.patch
# This has too many dependencies. We will not build it.
Patch3: %{pkg_name}-remove-weaving.patch
Patch2: %{pkg_name}-remove-weaving.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=377515
Patch4: %{pkg_name}-p2-pick-up-renamed-jars.patch
Patch3: %{pkg_name}-p2-pick-up-renamed-jars.patch
# Patch for this was contributed. Unlikely to be released.
Patch5: %{pkg_name}-ignore-version-when-calculating-home.patch
Patch4: %{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.
Patch6: %{pkg_name}-remove-jgit-provider.patch
Patch5: %{pkg_name}-remove-jgit-provider.patch
# This is for Fedora purposes to have working eclipse-pdebuild script.
Patch7: %{pkg_name}-pdebuild-add-target.patch
Patch6: %{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
Patch8: %{pkg_name}-change-build-packagings.patch
Patch7: %{pkg_name}-change-build-packagings.patch
Patch9: %{pkg_name}-test-support.patch
Patch8: %{pkg_name}-test-support.patch
Patch10: %{pkg_name}-secondary-arches.patch
Patch9: %{pkg_name}-secondary-arches.patch
Patch11: %{pkg_name}-debug-symbols.patch
Patch10: %{pkg_name}-debug-symbols.patch
Patch12: %{pkg_name}-fix-comaptibility-class.patch
Patch11: %{pkg_name}-fix-comaptibility-class.patch
Patch15: %{pkg_name}-fix-startup-class-refresh.patch
Patch12: %{pkg_name}-fix-startup-class-refresh.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=408138
Patch16: %{pkg_name}-fix-dropins.patch
Patch13: %{pkg_name}-fix-dropins.patch
Patch17: %{pkg_name}-bug-386377.patch
Patch14: %{pkg_name}-bug-386377.patch
# Port eclipse user assistance to latest version of lucene
Patch19: %{pkg_name}-lucene-4.patch
Patch15: %{pkg_name}-lucene-4.patch
# Resolving the target platform requires too many changes, so don't use it
Patch20: %{pkg_name}-no-target-platform.patch
Patch16: %{pkg_name}-no-target-platform.patch
# org.mockito -> org.mockito.mockito-core
Patch21: %{pkg_name}-mockito.patch
Patch17: %{pkg_name}-mockito.patch
Patch22: %{pkg_name}-policy-comparators.patch
Patch18: %{pkg_name}-policy-comparators.patch
Patch23: %{pkg_name}-webkit2-support.patch
Patch19: %{pkg_name}-webkit2-support.patch
Patch25: %{pkg_name}-support-symlink-bundles.patch
Patch20: %{pkg_name}-support-symlink-bundles.patch
# Feature plugin definitions lock onto version of plugin at build-time.
# If plugin is external, updating it breaks the feature. (version changes)
@ -114,10 +114,10 @@ Patch25: %{pkg_name}-support-symlink-bundles.patch
# -javax.annotation
# +org.apache.geronimo.specs.geronimo-annotation_1.1_spec
# -org.w3c.dom.smil
Patch26: %{pkg_name}-feature-plugins-to-category-ius.patch
Patch21: %{pkg_name}-feature-plugins-to-category-ius.patch
# Require hamcrest when using directly (cannot rely on junit reexporting it)
Patch28: eclipse-direct-hamcrest-use.patch
Patch22: eclipse-direct-hamcrest-use.patch
BuildRequires: rsync
BuildRequires: make, gcc
@ -248,7 +248,7 @@ Requires: %{name}-swt = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release}
Requires: httpcomponents-core >= 4.4.1-1
Requires: httpcomponents-client >= 4.4.1-1
%{?scl:Requires: %scl_runtime}
Obsoletes: %{name}-rcp < 1:4.3.0
Provides: %{name}-rcp = 1:%{eclipse_version}-%{release}
@ -317,6 +317,7 @@ Eclipse Tests.
tar --strip-components=1 -xf %{SOURCE1}
%patch0
%patch1
%patch2
%patch3
@ -325,21 +326,20 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch6
%patch7
%patch8
%patch9
%patch10 -p1
%patch9 -p1
%patch10
%patch11
%patch12
%patch15
%patch13
%patch14
%patch15 -p1
%patch16
%patch17
%patch19 -p1
%patch18
%patch19
%patch20
%patch21
%patch22
%patch23
%patch25
%patch26
%patch28
# 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
@ -1036,6 +1036,9 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
%changelog
* Wed Apr 01 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.12.git201503310800
- Organise patches
* Wed Apr 01 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.11.git201503310800
- Begin using mvn_install for installing dropins
- This allows us to make sub-packages noarch