[eclipse] Overall improvement of the spec file.
Krzysztof Daniel
kdaniel at fedoraproject.org
Thu Aug 30 15:23:48 UTC 2012
commit fe2d6eaa3717868df272f4dad471d6f439cccc77
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Tue Aug 28 10:41:26 2012 +0200
Overall improvement of the spec file.
eclipse-change-build-packagings.patch | 48 +++++++++++++++++++
eclipse-help-feature-adjust-dependencies.patch | 34 ++++++++++++++
eclipse.spec | 58 ++++++++++--------------
3 files changed, 106 insertions(+), 34 deletions(-)
---
diff --git a/eclipse-change-build-packagings.patch b/eclipse-change-build-packagings.patch
new file mode 100644
index 0000000..487e60a
--- /dev/null
+++ b/eclipse-change-build-packagings.patch
@@ -0,0 +1,48 @@
+--- pom.xml.bak 2012-08-28 09:57:16.432181359 +0200
++++ pom.xml 2012-08-28 09:58:00.791440793 +0200
+@@ -49,10 +49,13 @@
+ <module>rt.equinox.bundles</module>
+ <module>rt.equinox.framework</module>
+ <module>rt.equinox.p2</module>
++ <module>rt.equinox.incubator</module>
+
+ <module>eclipse.platform.releng</module>
+
+ <module>TMP/org.eclipse.sdk.epp</module>
++ <module>TMP/jdtpde</module>
++
+ <module>TMP/eclipse-junit-tests</module>
+ </modules>
+ </project>
+--- TMP/org.eclipse.sdk.epp/pom.xml.bak 2012-08-28 09:35:00.000000000 +0200
++++ TMP/org.eclipse.sdk.epp/pom.xml 2012-08-28 10:02:35.739112336 +0200
+@@ -46,7 +46,7 @@
+ <profile>SDKProfile</profile>
+ <products>
+ <product>
+- <id>org.eclipse.sdk.epp</id>
++ <id>org.fedoraproject.eclipse.platform</id>
+ <rootFolder>eclipse</rootFolder>
+ </product>
+ </products>
+--- TMP/org.eclipse.sdk.epp/org.eclipse.sdk.epp.product.bak 2012-08-28 10:04:10.214701605 +0200
++++ TMP/org.eclipse.sdk.epp/org.eclipse.sdk.epp.product 2012-08-28 10:04:29.568822865 +0200
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <?pde version="3.5"?>
+
+-<product uid="org.eclipse.sdk.epp" name="Eclipse SDK" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.2.0.qualifier" useFeatures="true" includeLaunchers="true">
++<product uid="org.fedoraproject.eclipse.platform" name="Eclipse SDK" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.2.0.qualifier" useFeatures="true" includeLaunchers="true">
+
+ <configIni use="default">
+ </configIni>
+@@ -159,7 +159,8 @@
+ </plugins>
+
+ <features>
+- <feature id="org.eclipse.sdk"/>
++ <feature id="org.eclipse.platform"/>
++ <feature id="org.eclipse.cvs"/>
+ <feature id="org.eclipse.equinox.p2.user.ui"/>
+ <!--
+ <feature id="org.eclipse.rcp.configuration"/>
diff --git a/eclipse-help-feature-adjust-dependencies.patch b/eclipse-help-feature-adjust-dependencies.patch
index 59a82f7..1a295f9 100644
--- a/eclipse-help-feature-adjust-dependencies.patch
+++ b/eclipse-help-feature-adjust-dependencies.patch
@@ -114,3 +114,37 @@ diff -r -Nu eclipse-3.8.0-M1-src/plugins/org.eclipse.help.base/META-INF/MANIFEST
<versionRange>[2.9,3.0)</versionRange>
</requirement>
<requirement>
+--- eclipse.platform.ua/org.eclipse.help.base/pom.xml.bak 2012-08-28 09:32:59.754115174 +0200
++++ eclipse.platform.ua/org.eclipse.help.base/pom.xml 2012-08-28 09:28:24.281350613 +0200
+@@ -34,12 +34,12 @@
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.lucene.core</id>
+- <versionRange>[2.9,3.0)</versionRange>
++ <versionRange>[3.0,4.0)</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.lucene.analysis</id>
+- <versionRange>[2.9,3.0)</versionRange>
++ <versionRange>[3.0,4.0)</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak 2012-08-28 09:30:36.530197639 +0200
++++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml 2012-08-28 09:28:24.276350580 +0200
+@@ -38,12 +38,12 @@
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.lucene.core</id>
+- <versionRange>[2.9,3.0)</versionRange>
++ <versionRange>[3.0,4.0)</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.lucene.analysis</id>
+- <versionRange>[2.9,3.0)</versionRange>
++ <versionRange>[3.0,4.0)</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
diff --git a/eclipse.spec b/eclipse.spec
index 1bd5d91..de75605 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -167,6 +167,12 @@ Patch23: %{name}-fix-comilation-lucene-3.6-compile.patch
# This is for Fedora purposes to have working eclipse-pdebuild script.
Patch24: %{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
+Patch25: %{name}-change-build-packagings.patch
+
BuildRequires: ant >= 1.8.3
BuildRequires: rsync
BuildRequires: jpackage-utils >= 0:1.5, make, gcc
@@ -363,6 +369,7 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch22
%patch23
%patch24
+%patch25
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=386040
%pom_disable_module bundles/org.eclipse.equinox.http.jetty5 rt.equinox.bundles .
@@ -382,11 +389,11 @@ tar --strip-components=1 -xf %{SOURCE1}
# 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/1.5.0/docs/api|%{_datadir}/javadoc/java|" \
+sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/java|" \
-e "/osgi\.org/d" \
-e "s|-breakiterator|;../org.eclipse.equinox.util/@dot\n;../org.eclipse.ecf.filetransfer_3.0.0.v20090302-0803.jar\n;../org.eclipse.ecf_3.0.0.v20090302-0803.jar\n-breakiterator|" \
eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
-sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \
+sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/java|" \
-e "s/win32.win32.x86/gtk.linux.${ARCH}/" \
eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt
sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/java|" \
@@ -397,7 +404,7 @@ sed -i -e "s|http://download.oracle.com/javase/1.4.2/docs/api|%{_datadir}/javado
-e "/osgi\.org/d" \
eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt \
eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
-sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \
+sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/java|" \
eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt \
eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
@@ -413,45 +420,26 @@ find . -type f -name build.properties -exec sed -i -e "s/javacTarget=jsr14/javac
find . -name pom.xml -exec sed -i -e "s/jsr14/1.5/" {} \;
find . -name org.eclipse.jdt.core.prefs -exec sed -i -e "s/inlineJsrBytecode=enabled/inlineJsrBytecode=disabled/" {} \;
-#https://bugs.eclipse.org/bugs/show_bug.cgi?id=386298
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=386298
sed -i -e "s/new Equinox(configuration)/new Equinox((Map<String, ?>) (Object) configuration)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
sed -i -e "s/new Equinox(configuration1)/new Equinox((Map<String, ?>) (Object) configuration1)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
sed -i -e "s/new Equinox(configuration2)/new Equinox((Map<String, ?>) (Object) configuration2)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
sed -i -e "s/new Equinox(configuration)/new Equinox((Map<String, ?>) (Object) configuration)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java
-#Other compilation problems caused by 1.4 -> 1.5 change
+# Other compilation problems caused by 1.4 -> 1.5 change
sed -i -e "s/ctxt.getBundleContext().registerService(getClass().getName(), this, serviceProps)/ctxt.getBundleContext().registerService(getClass().getName(), this, (Dictionary<String,?>)(Object)serviceProps)/" rt.equinox.bundles/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb16/org/eclipse/equinox/ds/tests/tb16/TargetProperties.java
sed -i -e "s/ctxt.getBundleContext().registerService(PropertiesProvider.class.getName(), this, serviceProps)/ctxt.getBundleContext().registerService(PropertiesProvider.class.getName(), this, (Dictionary<String,?>)(Object)serviceProps)/" rt.equinox.bundles/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb17/org/eclipse/equinox/ds/tests/tb17/Worker.java
+
+# Partially covered by https://bugs.eclipse.org/bugs/show_bug.cgi?id=386377
sed -i -e "s/1407/1503/" rt.equinox.framework/launcher-binary-parent/pom.xml
sed -i -e "s/1500/1503/" rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.${ARCH}/pom.xml
-#https://bugs.eclipse.org/bugs/show_bug.cgi?id=386503
-sed -i -e "s/3.6.0,4.0.0/3.0.0,4.0.0/" eclipse.platform.ua/org.eclipse.ui.intro/META-INF/MANIFEST.MF
-
-
-sed -i -e "s/org.eclipse.sdk.epp/org.fedoraproject.eclipse.platform/" TMP/org.eclipse.sdk.epp/org.eclipse.sdk.epp.product
-sed -i -e "s/<id>org.eclipse.sdk.epp<\/id>/<id>org.fedoraproject.eclipse.platform<\/id>/" TMP/org.eclipse.sdk.epp/pom.xml
-sed -i -e "s/<feature id=\"org.eclipse.sdk\"\/>/<feature id=\"org.eclipse.platform\"\/><feature id=\"org.eclipse.cvs\"\/>/" TMP/org.eclipse.sdk.epp/org.eclipse.sdk.epp.product
-sed -i -e "s/\"org.eclipse.sdk.ide\"/\"org.eclipse.platform.ide\"/" TMP/org.eclipse.sdk.epp/org.eclipse.sdk.epp.product
-
-sed -i -e "s/<module>TMP\/org.eclipse.sdk.epp<\/module>/<module>TMP\/org.eclipse.sdk.epp<\/module><module>TMP\/jdtpde<\/module>/" pom.xml
-
-
-
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=386670
-# additional poms are a part of e-b
-sed -i -e "s/<module>rt.equinox.p2<\/module>/<module>rt.equinox.p2<\/module><module>rt.equinox.incubator<\/module>/" pom.xml
-
-
-sed -i -e "s/2.9,3.0/3.0,4.0/" eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml
-sed -i -e "s/2.9,3.0/3.0,4.0/" eclipse.platform.ua/org.eclipse.help.base/pom.xml
-
+# remove git from cbi build. It was explained earlier why.
sed -i -e "s@ org.eclipse.egit.core;bundle-version=\"1.3.0\";resolution:=optional@ org.eclipse.ui@" eclipse.platform.releng/bundles/org.eclipse.releng.tools/META-INF/MANIFEST.MF
-sed -i -e "s@ org.eclipse.jgit;bundle-version=\"1.3.0\";resolution:=optional,@ org.eclipse.ui,@" eclipse.platform.releng/bundles/org.eclipse.releng.tools/META-INF/MANIFEST.MF
-#sed -i -e "s@ org.eclipse.ui.console,@ org.eclipse.ui.console@" eclipse.platform.releng/bundles/org.eclipse.releng.tools/META-INF/MANIFEST.MF
-
+sed -i -e "s@ org.eclipse.jgit;bundle-version=\"1.3.0\";resolution:=optional,@ org.eclipse.ui,@" eclipse.platform.releng/bundles/org.eclipse.releng.tools/META-INF/MANIFEST.MF
+# without git we are not able to compile those classes.
rm eclipse.platform.releng/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/git/*
%build
@@ -477,12 +465,12 @@ mvn-rpmbuild -f maven-cbi-plugin/pom.xml \
clean install \
-Dmaven.local.mode=true -Dtycho.local.keepTarget -Demf-repo.url=file:/`pwd`/repo
-#workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=386377
-#pushd rt.equinox.framework/bundles/org.eclipse.equinox.executable
+# workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=386377
+# pushd rt.equinox.framework/bundles/org.eclipse.equinox.executable
mvn-rpmbuild clean install \
-Dmaven.test.skip=true -Dnative=linux.gtk.${ARCH} \
-Dmaven.local.mode=true -Dtycho.local.keepTarget -Demf-repo.url=file:/`pwd`/repo
-#popd
+# popd
mvn-rpmbuild clean install \
-Dmaven.test.skip=true -Dnative=linux.gtk.${ARCH} \
@@ -600,7 +588,7 @@ popd
#enf of platform symlinking
-#quit the eclispe folder
+#quit the eclipse folder
popd
#make a backup
@@ -655,6 +643,8 @@ done
cp -r jdt sdk eclipse/dropins
+
+#clean up
cd eclipse
rm -rf configuration/org.eclipse.core.runtime
rm -rf configuration/org.eclipse.equinox.app
@@ -1165,7 +1155,7 @@ rm -rf %{_bindir}/efj/
* Fri Aug 24 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-12
- Fix eclipse-pdebuild script to have proper path to pde bundle.
- Ensure there are right R dependencies between subpackages.
-- Commented existing patches.
+- Overall spec improvements.
* Thu Aug 23 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-11
- Symlink junit 4.
More information about the scm-commits
mailing list