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

Update to RC2.

Browse Source
This commit is contained in:
Krzysztof Daniel 2013-05-29 10:28:50 +02:00
parent 1ea52f2ade
commit 2f07c26ed8
4 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
eclipse-change-build-packagings.patch
View File

@ -1,18 +1,14 @@
--- eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml.bak 2012-08-28 09:35:00.000000000 +0200
+++ eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml 2012-08-28 10:02:35.739112336 +0200
@@ -51,10 +51,11 @@
<profile>SDKProfile</profile>
<products>
<product>
- <id>org.eclipse.platform.ide</id>
+ <id>org.fedoraproject.eclipse.platform</id>
<rootFolder>eclipse</rootFolder>
</product>
</products>
+ <!--source>repository</source-->
</configuration>
</execution>
<execution>
@@ -80,7 +80,7 @@
<profile>SDKProfile</profile>
<products>
<product>
- <id>org.eclipse.platform.ide</id>
+ <id>org.fedoraproject.eclipse.platform</id>
<rootFolder>eclipse</rootFolder>
</product>
</products>
--- eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product.bak 2012-08-28 10:04:10.214701605 +0200
+++ eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product 2012-08-28 10:04:29.568822865 +0200
@@ -1,7 +1,7 @@
@ -35,11 +31,11 @@
--- eclipse.platform.releng.tychoeclipsebuilder/pom.xml.bak 2012-12-17 15:03:11.000000000 +0100
+++ eclipse.platform.releng.tychoeclipsebuilder/pom.xml 2012-12-18 10:32:35.835825807 +0100
@@ -37,5 +37,6 @@
<module>osgistarter.config.launcher</module>
<module>equinox.starterkit.product</module>
<module>eclipse-junit-tests</module>
+ <module>jdtpde</module>
</modules>
<module>osgistarter.config.launcher</module>
<module>equinox.starterkit.product</module>
<module>eclipse-junit-tests</module>
+ <module>jdtpde</module>
</modules>
</project>
--- eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml.bak 2012-07-25 17:26:52.000000000 +0200
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml 2012-09-10 10:46:53.027809695 +0200

23
eclipse.spec
View File

@ -10,8 +10,8 @@ Epoch: 1
%global eclipse_micro 0
%global initialize 1
%global eb_commit b963e34cbd5ead603a051b7d4b79fc91114ccd87
%global eclipse_tag beff8aaa8d7cbe1dd707ffc88224eb1f41381e5d
%global build_id I20130128-1400
%global eclipse_tag fde729c719c431ab993b2e7a3070ef972140bf33
%global build_id I20130527-0800
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
%global installation_loc %{_libdir}/%{pkg_name}
@ -52,7 +52,7 @@ fi;
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
Release: 0.55.gitbeff8a2%{?dist}
Release: 0.56.gitfde729%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@ -120,6 +120,8 @@ Patch23: %{pkg_name}-jetty-9.patch
Patch25: %{pkg_name}-fix-startup-class-refresh.patch
Patch26: %{pkg_name}-fix-dropins.patch
BuildRequires: ant >= 1.8.3
BuildRequires: rsync
BuildRequires: jpackage-utils >= 0:1.5, make, gcc
@ -163,7 +165,7 @@ BuildRequires: lucene >= 2.9.4-8
BuildRequires: lucene-contrib >= 2.9.4-8
BuildRequires: junit >= 4.10-5
BuildRequires: hamcrest >= 0:1.1-11
BuildRequires: %{?scl_prefix}sat4j >= 2.3.3-1
BuildRequires: %{?scl_prefix}sat4j >= 2.3.5-1
BuildRequires: objectweb-asm >= 3.3.1-1
BuildRequires: zip
BuildRequires: sac >= 1.3-12
@ -242,7 +244,7 @@ Requires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version}
Requires: jsch >= 0.1.46-2
Requires: lucene >= 2.9.4-8
Requires: lucene-contrib >= 2.9.4-8
Requires: %{?scl_prefix}sat4j >= 2.3.3-1
Requires: %{?scl_prefix}sat4j >= 2.3.5-1
Requires: sac >= 1.3-12
Requires: xml-commons-apis >= 1.4.01-12
Requires: batik >= 1.8
@ -338,6 +340,7 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch22
%{!?scl:%patch23}
%patch25
%patch26
#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
@ -380,6 +383,9 @@ tar --strip-components=1 -xf %{SOURCE1}
%pom_disable_module bundles/org.eclipse.swt.gtk.solaris.sparc eclipse.platform.swt.binaries
%pom_disable_module bundles/org.eclipse.swt.gtk.solaris.x86 eclipse.platform.swt.binaries
%pom_disable_module bundles/org.sat4j.core rt.equinox.p2
%pom_disable_module bundles/org.sat4j.pb rt.equinox.p2
# Use our system-installed javadocs, reference only what we built, and
# don't like to osgi.org docs (FIXME: maybe we should package them?)
sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/java|" \
@ -491,13 +497,13 @@ pushd eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.%{eclipse_
-DartifactId=org.eclipse.jdt.core -Dversion=3.9.0.v20130501-2249 -Dpackaging=jar -DskipTychoVersionCheck \
-Dtycho.local.keepTarget
mvn-rpmbuild clean install \
mvn-rpmbuild clean verify \
-Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} -DskipTychoVersionCheck \
-Dtycho.local.keepTarget -Dmaven.repo.local=../../../.m2
popd
export GTK_VERSION=3.0
mvn-rpmbuild clean install \
mvn-rpmbuild clean verify \
-Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} -DskipTychoVersionCheck \
-Dtycho.local.keepTarget
@ -1001,6 +1007,9 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
%changelog
* Wed May 29 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.3.0-0.56.gitfde729
- Update to RC2.
* Thu May 23 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.3.0-0.55.gitbeff8a2
- Fix the testing.properties location.

2
get-eclipse.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
set -e
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
TAG=beff8aaa8d7cbe1dd707ffc88224eb1f41381e5d
TAG=fde729c719c431ab993b2e7a3070ef972140bf33
#source http://www.linuxjournal.com/content/normalizing-path-names-bash
function normalize()

2
sources
View File

@ -1,2 +1,2 @@
ebe4cd935ca17e857353592760b3f17a R4_platform-aggregator-beff8aaa8d7cbe1dd707ffc88224eb1f41381e5d.tar.bz2
96477980bdb675b7327fbe0f5592b4fa R4_platform-aggregator-fde729c719c431ab993b2e7a3070ef972140bf33.tar.bz2
0aff7988c384ece2ac27e6abfe517e77 eclipse-build-b963e34cbd5ead603a051b7d4b79fc91114ccd87.tar.xz