[eclipse] - Install icons for sclized version. - Update to latest upstream.
Krzysztof Daniel
kdaniel at fedoraproject.org
Sun Apr 7 19:49:25 UTC 2013
commit 0d0e6162386922861f3ada5ea38ec360aabe2ba7
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Sun Apr 7 21:49:16 2013 +0200
- Install icons for sclized version.
- Update to latest upstream.
eclipse-change-build-packagings.patch | 6 +-
eclipse-fix-comaptibility-class.patch | 7 ---
eclipse-no-source-for-dependencies.patch | 14 +++---
eclipse-remove-jgit-provider.patch | 6 +-
eclipse-test-support.patch | 44 ++++++++-------
eclipse.spec | 85 +++++++++++++++++------------
sources | 2 +-
7 files changed, 87 insertions(+), 77 deletions(-)
---
diff --git a/eclipse-change-build-packagings.patch b/eclipse-change-build-packagings.patch
index 81c015c..e93d0cc 100644
--- a/eclipse-change-build-packagings.patch
+++ b/eclipse-change-build-packagings.patch
@@ -1,6 +1,6 @@
--- 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
-@@ -45,10 +45,11 @@
+@@ -51,10 +51,11 @@
<profile>SDKProfile</profile>
<products>
<product>
@@ -19,12 +19,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
--<product uid="org.eclipse.platform.ide" name="Eclipse Platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.3.0.qualifier" useFeatures="true" includeLaunchers="false">
+-<product uid="org.eclipse.platform.ide" name="Eclipse Platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.3.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product uid="org.fedoraproject.eclipse.platform" name="Eclipse Platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.3.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
-@@ -159,6 +159,7 @@
+@@ -160,6 +160,7 @@
<feature id="org.eclipse.platform"/>
<feature id="org.eclipse.equinox.p2.user.ui"/>
<feature id="org.eclipse.rcp.configuration"/>
diff --git a/eclipse-fix-comaptibility-class.patch b/eclipse-fix-comaptibility-class.patch
index c155a80..10511e8 100644
--- a/eclipse-fix-comaptibility-class.patch
+++ b/eclipse-fix-comaptibility-class.patch
@@ -58,10 +58,3 @@
+ </profile>
+ </profiles>
</project>
---- eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/META-INF/MANIFEST.MF
-+++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/META-INF/MANIFEST.MF
-@@ -10,3 +10,4 @@
- Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
- J2SE-1.3
- Eclipse-BundleShape: dir
-+Require-Capability: osgi.identity; filter:="(osgi.identity=org.eclipse.core.runtime)"; resolution:=optional
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
index a93125f..d5582f8 100644
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@@ -1,9 +1,9 @@
--- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml.bak 2012-07-25 17:45:43.000000000 +0200
+++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml 2012-07-31 07:41:13.103636303 +0200
-@@ -42,6 +42,21 @@
+@@ -39,6 +39,21 @@
<excludes>
- <plugin id="org.sat4j.core" />
- <plugin id="org.sat4j.pb" />
+ <plugin id="org.sat4j.core"/>
+ <plugin id="org.sat4j.pb"/>
+ <plugin id="org.apache.commons.codec" />
+ <plugin id="org.apache.commons.httpclient" />
+ <plugin id="org.apache.httpcomponents.httpclient" />
@@ -24,7 +24,7 @@
</execution>
--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak 2012-07-31 07:43:57.000000000 +0200
+++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml 2012-07-31 08:05:24.279277920 +0200
-@@ -59,6 +59,17 @@
+@@ -53,6 +53,17 @@
<goals>
<goal>source-feature</goal>
</goals>
@@ -44,7 +44,7 @@
</plugin>
--- eclipse.pde/org.eclipse.pde-feature/pom.xml.bak 2013-01-29 11:22:47.065953870 +0100
+++ eclipse.pde/org.eclipse.pde-feature/pom.xml 2013-01-29 11:23:18.630196529 +0100
-@@ -39,6 +39,7 @@
+@@ -36,6 +36,7 @@
<configuration>
<excludes>
<plugin id="org.eclipse.pde"/>
@@ -56,8 +56,8 @@
+++ eclipse.jdt/org.eclipse.jdt-feature/pom.xml 2013-02-21 10:08:50.404275226 +0100
@@ -59,6 +59,8 @@
<excludes>
- <plugin id="org.eclipse.jdt" />
- <plugin id="org.eclipse.jdt.doc.user" />
+ <plugin id="org.eclipse.jdt"/>
+ <plugin id="org.eclipse.jdt.doc.user"/>
+ <plugin id="org.junit" />
+ <plugin id="org.hamcrest.core" />
</excludes>
diff --git a/eclipse-remove-jgit-provider.patch b/eclipse-remove-jgit-provider.patch
index 6e61d4b..a5ff8b0 100644
--- a/eclipse-remove-jgit-provider.patch
+++ b/eclipse-remove-jgit-provider.patch
@@ -1,6 +1,6 @@
--- eclipse-platform-parent/pom.xml.orig 2013-03-14 11:05:42.000000000 +0100
+++ eclipse-platform-parent/pom.xml 2013-03-14 13:11:05.104112979 +0100
-@@ -271,7 +271,7 @@
+@@ -289,7 +289,7 @@
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho.version}</version>
<dependencies>
@@ -21,9 +21,9 @@
<format>'v'yyyyMMdd-HHmm</format>
- <timestampProvider>jgit</timestampProvider>
+ <!--timestampProvider>jgit</timestampProvider-->
- <!--jgit.ignore>
+ <jgit.ignore>
pom.xml
- </jgit.ignore-->
+ </jgit.ignore>
- <sourceReferences>
+ <!--sourceReferences>
<generate>true</generate>
diff --git a/eclipse-test-support.patch b/eclipse-test-support.patch
index 69ab685..6c5ee40 100644
--- a/eclipse-test-support.patch
+++ b/eclipse-test-support.patch
@@ -98,11 +98,11 @@
+setArch
+
+ant \
-+-file "/usr/share/java/eclipse-testing/test.xml" $tests \
++-file "${testslocation}/test.xml" $tests \
+-Dws=$ws -Dos=$os -Darch=$arch -Dos.arch=$arch \
+-DbuildId=v20120903-1347 -Dbasedir="/tmp/eclipse-tests-directory" \
+-DruntimeArchive="eclipse-SDK-temp-linux-gtk-x86_64.tar.gz" \
-+-DrepoLocation="/usr/share/java/eclipse-testing/" \
++-DrepoLocation="${testslocation}" \
+-Dorg.eclipse.test="3.3.100" \
+-D$installmode=true $properties
@@ -152,13 +152,14 @@
- else
- $vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
- fi
---- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.bak 2013-03-14 11:05:42.000000000 +0100
-+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2013-03-14 13:40:32.972238775 +0100
-@@ -164,98 +164,15 @@
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2013-04-04 12:11:23.000000000 +0200
++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2013-04-04 13:51:49.816829140 +0200
+@@ -163,99 +163,17 @@
+
<!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail -->
<target name="setupPlatform">
- <echo message="os.arch ${os.arch}" />
-- <property file="equinoxp2tests.properties" />
+- <echo message="os.arch ${os.arch}" />
+- <loadproperties srcfile="equinoxp2tests.properties" />
- <condition
- property="platformArchive"
- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux}">
@@ -232,7 +233,7 @@
- <fail
- unless="platformArchive"
- message="platformArchive is not defined. Check that condidtions cover os arch ${os.arch}. May be VM dependent.)" />
--
+
- <condition
- property="platformTarget"
- value="platform-zip">
@@ -250,19 +251,20 @@
- <fail
- unless="platformTarget"
- message="platformTarget is not defined. Check that platformArchive variable and value is defined correctly, such as in equinoxp2tests.properties in the appropriate testConfig" />
-+ <property name="platformArchive" value="${runtimeArchive}" />
-+
-+ <condition property="platformTarget" value="platform-zip">
-+ <contains string="${platformArchive}" substring=".zip" />
-+ </condition>
-+ <condition property="platformTarget" value="platform-tar.gz">
-+ <contains string="${platformArchive}" substring=".tar.gz" />
-+ </condition>
-+
++ <loadproperties srcfile="equinoxp2tests.properties" />
++ <property name="platformArchive" value="${runtimeArchive}" />
++
++ <condition property="platformTarget" value="platform-zip">
++ <contains string="${platformArchive}" substring=".zip" />
++ </condition>
++ <condition property="platformTarget" value="platform-tar.gz">
++ <contains string="${platformArchive}" substring=".tar.gz" />
++ </condition>
++
<echo message="platformTarget ${platformTarget} platformArchive ${platformArchive}" />
<antcall target="${platformTarget}" />
</target>
-@@ -283,7 +200,7 @@
+@@ -283,7 +201,7 @@
<exec
dir="${platformLocation}"
executable="tar">
@@ -271,7 +273,7 @@
</exec>
</target>
-@@ -830,6 +747,18 @@
+@@ -830,6 +748,18 @@
arg2="" />
</not>
</condition>
@@ -290,7 +292,7 @@
<antcall target="runSuite" />
<antcall target="genResults" />
</target>
-@@ -1409,7 +1338,7 @@
+@@ -1409,7 +1339,7 @@
<antcall target="e4CssSwt" />
<antcall target="e4UI" />
<antcall target="equinoxds" />
@@ -299,7 +301,7 @@
<antcall target="bidi" />
<antcall target="ltkuirefactoringtests" />
<antcall target="ltkcorerefactoringtests" />
-@@ -1419,7 +1348,7 @@
+@@ -1419,7 +1349,7 @@
hang, during performance testss
-->
<target name="platformLR">
diff --git a/eclipse.spec b/eclipse.spec
index b62b9e1..6ab7514 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -30,12 +30,6 @@ Epoch: 1
%define eclipse_arch %{_arch}
%endif
-
-# Set this flag to 1 if you want to build Eclipse without dependency to eclipse-pde
-# Some parts (help) will not be built, and second run will be required, but this
-# is a way to bootstrap Eclipse on secondary archs.
-%global bootstrap 1
-
# FIXME: update java packaging guidelines for this. See
# fedora-devel-java-list discussion in September 2008.
#
@@ -57,7 +51,7 @@ fi;
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
-Release: 0.28.git38f1df9%{?dist}
+Release: 0.29%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@@ -192,9 +186,9 @@ BuildRequires: cbi-plugins
BuildRequires: xml-maven-plugin
BuildRequires: httpcomponents-core
BuildRequires: httpcomponents-client
-%if %{bootstrap} != 1
+BuildRequires: eclipse-egit
+BuildRequires: eclipse-jgit
BuildRequires: eclipse-pde
-%endif
%if 0%{?rhel} >= 6
ExclusiveArch: %{ix86} x86_64
%endif
@@ -380,16 +374,12 @@ tar --strip-components=1 -xf %{SOURCE1}
%pom_disable_module features/master-equinox eclipse.platform.releng
%pom_disable_module features/master eclipse.platform.releng
%pom_disable_module features/master-ecf eclipse.platform.releng
-%pom_disable_module bundles/org.eclipse.releng.tools eclipse.platform.releng
-%pom_disable_module features/org.eclipse.releng.tools eclipse.platform.releng
%pom_disable_module bundles/org.eclipse.swt.gtk.aix.ppc eclipse.platform.swt.binaries
%pom_disable_module bundles/org.eclipse.swt.gtk.aix.ppc64 eclipse.platform.swt.binaries
%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 org.eclipse.pde.build.product.feature eclipse.pde.build
-
# 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|" \
@@ -476,6 +466,9 @@ done
cp -r /usr/share/java/emf/eclipse/features/* .m2/p2/repo-sdk/features/
%{?scl: cp %{_javadir}/ecf/eclipse/plugins/* .m2/p2/repo-sdk/plugins}
+%{?scl: cp %{_javadir}/*sat4j* .m2/p2/repo-sdk/plugins}
+cp -rf %{_libdir}/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_* .m2/p2/repo-sdk/plugins/
+cp -rf %{_libdir}/eclipse/dropins/sdk/plugins/org.eclipse.pde.core_* .m2/p2/repo-sdk/plugins/
sed -i -e 's@>org.eclipse.jdt<@>org.eclipse.tycho<@' eclipse-platform-parent/pom.xml
sed -i -e 's@!long at long@' eclipse-platform-parent/pom.xml
@@ -483,10 +476,26 @@ sed -i -e 's@!long at long@' eclipse-platform-parent/pom.xml
find eclipse.platform.ua -name pom.xml -exec sed -i -e 's at org.apache.lucene<@org.apache.lucene.core<@g' {} \;
+sed -i -e 's/1.0.0/4.3.0/g' eclipse.platform.releng.tychoeclipsebuilder/jdtpde/pom.xml
+sed -i -e 's/600/700/g' eclipse.platform.debug/org.eclipse.core.variables/pom.xml
+sed -i -e 's/100/200/g' eclipse.platform.debug/org.eclipse.core.externaltools/pom.xml
+sed -i -e 's/100/200/g' eclipse.jdt.debug/org.eclipse.jdt.launching.macosx/pom.xml
+sed -i -e 's/100/200/g' eclipse.jdt.debug/org.eclipse.jdt.launching.ui.macosx/pom.xml
+sed -i -e 's/200/300/g' eclipse.pde.ui/ds/org.eclipse.pde.ds.core/pom.xml
+sed -i -e 's/200/300/g' eclipse.pde.ui/ds/org.eclipse.pde.ds.ui/pom.xml
+sed -i -e 's/200/300/g' eclipse.pde.ui/ua/org.eclipse.pde.ua.core/pom.xml
+sed -i -e 's/200/300/g' eclipse.pde.ui/ua/org.eclipse.pde.ua.tests/pom.xml
+sed -i -e 's/200/300/g' eclipse.pde.ui/ui/org.eclipse.pde.junit.runtime/pom.xml
+sed -i -e 's/500/600/g' eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/pom.xml
+sed -i -e 's/100/200/g' eclipse.platform.debug/org.eclipse.debug.examples.core/pom.xml
+
+LOCALREPO="file://`pwd`/.m2/p2/repo"
+find eclipse.platform.common/bundles -name pom.xml -exec sed -i -e "s at http://download.eclipse.org/eclipse/updates/4.2@${LOCALREPO}@g" {} \;
%build
+%{?scl:%scl_maven_opts}
#This is the lowest value where the build succeeds. 512m is not enough.
-export MAVEN_OPTS="-Xmx900m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState"
+export MAVEN_OPTS="-Xmx900m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
mvn-rpmbuild -f eclipse-platform-parent/pom.xml \
install \
@@ -583,18 +592,20 @@ popd #eclipse
%install
#install icons
-%{?!scl: install -D eclipse.platform/platform/org.eclipse.platform/eclipse32.png \
- $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/eclipse.png }
-%{?!scl: install -D eclipse.platform/platform/org.eclipse.platform/eclipse48.png \
- $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/eclipse.png }
-%{?!scl: install -D eclipse.platform/platform/org.eclipse.platform/eclipse256.png \
- $RPM_BUILD_ROOT/usr/share/icons/hicolor/256x256/apps/eclipse.png }
-%{?!scl: mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ }
-%{?!scl:ln -s /usr/share/icons/hicolor/256x256/apps/eclipse.png \
- $RPM_BUILD_ROOT/usr/share/pixmaps/eclipse.png}
+install -D eclipse.platform/platform/org.eclipse.platform/eclipse32.png \
+ $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/%{?scl_prefix}eclipse.png
+install -D eclipse.platform/platform/org.eclipse.platform/eclipse48.png \
+ $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/%{?scl_prefix}eclipse.png
+install -D eclipse.platform/platform/org.eclipse.platform/eclipse256.png \
+ $RPM_BUILD_ROOT/usr/share/icons/hicolor/256x256/apps/%{?scl_prefix}eclipse.png
+mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
+ln -s /usr/share/icons/hicolor/256x256/%{?scl_prefix}apps/eclipse.png \
+ $RPM_BUILD_ROOT/usr/share/pixmaps/%{?scl_prefix}eclipse.png
#desktop file
-%{?!scl: install -D desktopintegration/eclipse.desktop $RPM_BUILD_ROOT/usr/share/applications/eclipse.desktop}
+%{?scl: sed -i -e 's/Exec=eclipse/Exec=scl enable %{scl_name} eclipse/g' desktopintegration/eclipse.desktop}
+%{?scl: sed -i -e 's/Icon=eclipse/Icon=%{?scl_prefix}eclipse/g' desktopintegration/eclipse.desktop}
+install -D desktopintegration/eclipse.desktop $RPM_BUILD_ROOT/usr/share/applications/%{?scl_prefix}eclipse.desktop
# Some directories we need
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java
@@ -745,16 +756,16 @@ echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{
%post platform
-%{?!scl:touch --no-create %{_datadir}/icons/hicolor}
-%{?!scl:if [ -x /usr/bin/gtk-update-icon-cache ]; then}
- %{?!scl:gtk-update-icon-cache -q %{_datadir}/icons/hicolor}
-%{?!scl:fi}
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
%postun platform
-%{?!scl:touch --no-create %{_datadir}/icons/hicolor}
-%{?!scl:if [ -x /usr/bin/gtk-update-icon-cache ]; then}
- %{?!scl:gtk-update-icon-cache -q %{_datadir}/icons/hicolor}
-%{?!scl:fi}
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+scl:fi
%pre jdt
# workaround for rpm bug, can be removed in F-20 Fixes the problem with efj being directory instead of launcher
@@ -779,9 +790,9 @@ echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{
%{_libdir}/%{pkg_name}/.eclipseproduct
%config %{_libdir}/%{pkg_name}/eclipse.ini
%config %{_sysconfdir}/eclipse.ini
-%{?!scl:%{_datadir}/applications/*}
-%{?!scl:%{_datadir}/pixmaps/}
-%{?!scl:%{_datadir}/icons/*/*/apps/*}
+/usr/share/applications/*
+/usr/share/pixmaps/
+/usr/share/icons/*/*/apps/*
%{_libdir}/%{pkg_name}/eclipse
%dir %{_libdir}/%{pkg_name}/dropins
%dir %{_datadir}/%{pkg_name}/dropins
@@ -1011,6 +1022,10 @@ echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
%changelog
+* Thu Apr 4 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.0-0.29
+- Install icons for sclized version.
+- Update to latest upstream.
+
* Thu Mar 21 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.0-0.28.git38f1df9
- Properly symlink ant dependencies.
diff --git a/sources b/sources
index 00f48cd..535ee24 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+9984cb673e1a7995bf52c33af260b61c eclipse-source.tar.bz2
3fb33bcb7ab9a191f6edcce95faa4e71 eclipse-build-d6063a02c1c32de4b1a262ba8a8da02bed578524.tar.xz
-ad3e929396a938efba96ea8c53c177b6 eclipse-source.tar.bz2
More information about the scm-commits
mailing list