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

- 3.4.1 

- Update nojarsignatures patch.
- Added osgi-classpath.patch fixes broken bootclasspath (Sean Flanigan).
- Removed patches 33 and 34 - not needed anymore.
This commit is contained in:
Alexander Kurtakov 2008-10-03 14:03:03 +00:00
parent 1705432496
commit 07c31238f2
5 changed files with 128 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -5,3 +5,5 @@ eclipse-fileinitializerapp.tar.bz2
eclipse-sourceBuild-srcIncluded-3.4.zip
org.fedoraproject.ide.feature-1.0.0.zip
org.fedoraproject.ide.platform-3.4.0-1.zip
eclipse-sourceBuild-srcIncluded-3.4.1.zip
eclipse-3.4.1-testframework.tar.bz2

99
eclipse-nojarsignatures.patch
View File

@ -1,16 +1,36 @@
diff -up plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF.nojarsignatures plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF
--- plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF.nojarsignatures 2008-07-08 17:20:06.000000000 -0400
+++ plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF 2008-07-08 17:20:19.000000000 -0400
@@ -57,178 +57,3 @@ Export-Package: images,org.apache.tools.
--- plugins/org.junit_3.8.2.v20080602-1318/META-INF/MANIFEST.MF.nojarsignature 2008-09-11 23:28:30.000000000 +0200
+++ plugins/org.junit_3.8.2.v20080602-1318/META-INF/MANIFEST.MF 2008-10-03 11:43:35.000000000 +0200
@@ -12,18 +12,3 @@
unit.swingui;version="3.8.2",junit.swingui.icons;version="3.8.2",juni
t.textui;version="3.8.2"
-Name: junit.jar
-SHA1-Digest: s29rIXKth1H1+Yz24tK0E9r/sxA=
-
-Name: plugin.properties
-SHA1-Digest: mL9yvXBmAAJi7G1tls7akuyPG+A=
-
-Name: about.html
-SHA1-Digest: UFe6k4Ad9XpZmuWF46WW3vk9dVA=
-
-Name: META-INF/eclipse.inf
-SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=
-
-Name: about_files/cpl-v10.html
-SHA1-Digest: o0b19ceZ+HQHVX0Ops751AQVdwM=
-
--- plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF.nojarsignature 2008-09-11 23:27:41.000000000 +0200
+++ plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF 2008-10-03 11:42:12.000000000 +0200
@@ -57,178 +57,3 @@
.ant.util.optional,org.apache.tools.ant.util.regexp,org.apache.tools.
bzip2,org.apache.tools.mail,org.apache.tools.tar,org.apache.tools.zip
Require-Bundle: org.eclipse.osgi
-
-Name: lib/ant-apache-bsf.jar
-SHA1-Digest: cLbTh5sinbLWGWUDCS84n0i2a0E=
-SHA1-Digest: DO50ciZuJhJDpVNImRUfEaBYUbI=
-
-Name: lib/ant-trax.jar
-SHA1-Digest: 3HKcsIRJKPlrfuIaJUDOtGEndrg=
-SHA1-Digest: FBI4uldnKZSyHcob4yOVNc3Hp38=
-
-Name: etc/maudit-frames.xsl
-SHA1-Digest: BIZGVBGe+t+oL7NBTtnF6SSR2UI=
@ -34,13 +54,13 @@ diff -up plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF.nojarsi
-SHA1-Digest: u+F8j/GAE8tzrDry9+wT3Cvg81Y=
-
-Name: lib/ant-launcher.jar
-SHA1-Digest: GPILSOan10oQR0XsnIUpAkN3hW8=
-SHA1-Digest: MKPgfhiWsE5F2R982ZCuSOWMXDg=
-
-Name: lib/ant-apache-bcel.jar
-SHA1-Digest: 249vQWKFKUpoY2wsy/gVYRVQA9Y=
-SHA1-Digest: kde0uYC3k2o+Fg+6LlcBEv6kWRk=
-
-Name: lib/ant-antlr.jar
-SHA1-Digest: sUjnJ2scpExnqFt7w3wTrxPBzMw=
-SHA1-Digest: J4AmyjIaAnoB7ebJ4iMzOb9+GtU=
-
-Name: etc/changelog.xsl
-SHA1-Digest: qhlQEgDDZI8YGnD/Lo/OLLdpwE4=
@ -49,22 +69,22 @@ diff -up plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF.nojarsi
-SHA1-Digest: ziSyDJrI6CYzulVP7xbFuMAk62w=
-
-Name: lib/ant-starteam.jar
-SHA1-Digest: /E3ouEPkRPL3WBvefzGRsck5lmc=
-SHA1-Digest: nXOBvJIHC5BOM3rQ0HeyF7q1z1A=
-
-Name: about.html
-SHA1-Digest: N0elfKP7uYuYLATOh5XaE1P3nXI=
-
-Name: lib/ant-jai.jar
-SHA1-Digest: MamtbKiOfCYyaKLBsNuL7HdasTA=
-SHA1-Digest: tIm5HD9PM1IT/EnYwT4D49j0kAo=
-
-Name: lib/ant-junit.jar
-SHA1-Digest: vKM3lSYbY8hlxKv/eh48EzoMr4s=
-SHA1-Digest: dr31YBzQyziIxwLsNjAoVUBhXkw=
-
-Name: lib/ant-swing.jar
-SHA1-Digest: h89jil3YSxk/sLy8HZubQDaqZZA=
-SHA1-Digest: CYx1MeeUeffKmXW3cKIyesK/1+M=
-
-Name: lib/ant-apache-log4j.jar
-SHA1-Digest: yo4BWxFzGJvFGlwAa9+lqooG+iE=
-SHA1-Digest: kDAL5HSGcBGx8BtqP8my+7nVxUA=
-
-Name: bin/ant
-SHA1-Digest: 1hZ7I8ryxuQA8ffu95k409JSpxM=
@ -73,22 +93,22 @@ diff -up plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF.nojarsi
-SHA1-Digest: YDWS/zHHaPn0kEZm/Az4+vJLzKI=
-
-Name: lib/ant-commons-net.jar
-SHA1-Digest: cW0crWNYgqgbNuezMwOUzY9ysfY=
-SHA1-Digest: zttoDSdHmKhPxQkVB2939l5dEOE=
-
-Name: lib/ant-jsch.jar
-SHA1-Digest: 2cWHrQfYXqJ6Ox5ESC+vnLUmKTQ=
-SHA1-Digest: 8TOFHxGi9/aJnOr5NWlYDPLTaG0=
-
-Name: lib/ant-netrexx.jar
-SHA1-Digest: L+voULB0JY9SHKXVQJ1LDHn7bUI=
-SHA1-Digest: SKI088GAW5X32myAJt2zYJtG4qw=
-
-Name: etc/checkstyle/checkstyle-text.xsl
-SHA1-Digest: v7HDzjT8VIMoo9nbczMpQ4R89OA=
-
-Name: lib/ant-jdepend.jar
-SHA1-Digest: l8MtENBefa2/Xp24qA+J9a93YIM=
-SHA1-Digest: v2pU8yfpZ4jDxE2GwwCqptNqf6k=
-
-Name: lib/ant-stylebook.jar
-SHA1-Digest: uQZ41IjyE1tK965YSxsqP+jqK0c=
-SHA1-Digest: lGD3Z67EkUsBV0HeiuLxoT73kJM=
-
-Name: about_files/NOTICE
-SHA1-Digest: Mu3gQHJl963VZJ+BCE906ZAhmXY=
@ -97,7 +117,7 @@ diff -up plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF.nojarsi
-SHA1-Digest: CuWmV380G7/H3FRwPp+feAg9d7E=
-
-Name: lib/ant-nodeps.jar
-SHA1-Digest: o5euDnSx3TKUufdhqOcdd85RM20=
-SHA1-Digest: t0PNaVw0F4+n1li/saOcEsZPZwo=
-
-Name: bin/complete-ant-cmd.pl
-SHA1-Digest: u8SyqqLh5SyqEPe8brM/glCglQo=
@ -112,10 +132,10 @@ diff -up plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF.nojarsi
-SHA1-Digest: wSBQFHcXT1XjHPWfk41j8XH1qeQ=
-
-Name: lib/ant-weblogic.jar
-SHA1-Digest: J6F+0H7fONfNWUCwSqb+7IK3Rkc=
-SHA1-Digest: ZeOoCvq1VpITkhgFC+p7NfSUgjk=
-
-Name: lib/ant-jmf.jar
-SHA1-Digest: NGPXYqQRsREHJe8qsEyPAg2RUAM=
-SHA1-Digest: L//Sz/mvat6UlYte0H9s1LuNSc8=
-
-Name: bin/ant.bat
-SHA1-Digest: p0LkZEyD/pMRF8Uo9Hxte58B9dI=
@ -127,13 +147,13 @@ diff -up plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF.nojarsi
-SHA1-Digest: Zkz4ykfgxadN8RCiCtVrI46bzu4=
-
-Name: lib/ant.jar
-SHA1-Digest: AyMypsce7YssTu3t0qKPuArssCw=
-SHA1-Digest: AB5l/BKpcx67Btb0DxbAIgIbNvw=
-
-Name: lib/ant-javamail.jar
-SHA1-Digest: EYOAc6WEA+Pj8MPPoa1W8neE1DQ=
-SHA1-Digest: kVOXUSeWHwNdsV7Y+pfipS3wCJY=
-
-Name: lib/ant-apache-resolver.jar
-SHA1-Digest: /bhh3PxZKpcm4EmiQRsOw81aHlI=
-SHA1-Digest: mNy/MGrXL8Ql+5ZoYGvu/qlG+1A=
-
-Name: bin/antRun
-SHA1-Digest: HXlDrtLiLYQs4XkPbksH6PzmiQ4=
@ -151,7 +171,7 @@ diff -up plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF.nojarsi
-SHA1-Digest: aeITXtUk9Yia5TTVXOd6qfMmPTM=
-
-Name: lib/ant-apache-oro.jar
-SHA1-Digest: WJ++owyMbcVbY3kBJgq2oNNGsCU=
-SHA1-Digest: 7lwzOPLMkxFX2C5YX/dkcYQdjng=
-
-Name: bin/antRun.bat
-SHA1-Digest: d765puLLhb82dE5NC5YNCn6DpeA=
@ -172,34 +192,11 @@ diff -up plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF.nojarsi
-SHA1-Digest: ulVeGl+WSkbjGbHF7LGA8Csuh/0=
-
-Name: lib/ant-commons-logging.jar
-SHA1-Digest: Vvp4W/tusjWem5gN4Y1cMVAJGck=
-SHA1-Digest: NWd0KBqXRSZbCMSItqs0tWQoi2E=
-
-Name: lib/ant-apache-regexp.jar
-SHA1-Digest: HQscc3xTxU2HKsoh8YlyUPpsr/Q=
-SHA1-Digest: xvqWfUXGkISU+7vSQaFsJe8s12k=
-
-Name: bin/runant.py
-SHA1-Digest: ptbC0mx7ZARrg/FG64aqqikvS2A=
-
diff -up plugins/org.junit_3.8.2.v20080602-1318/META-INF/MANIFEST.MF.nojarsignatures plugins/org.junit_3.8.2.v20080602-1318/META-INF/MANIFEST.MF
--- plugins/org.junit_3.8.2.v20080602-1318/META-INF/MANIFEST.MF.nojarsignatures 2008-07-08 17:19:51.000000000 -0400
+++ plugins/org.junit_3.8.2.v20080602-1318/META-INF/MANIFEST.MF 2008-07-08 17:20:22.000000000 -0400
@@ -11,19 +11,3 @@ Export-Package: junit.awtui;version="3.8
3.8.2",junit.framework;version="3.8.2",junit.runner;version="3.8.2",j
unit.swingui;version="3.8.2",junit.swingui.icons;version="3.8.2",juni
t.textui;version="3.8.2"
-
-Name: junit.jar
-SHA1-Digest: puYpCZFqVfqSN4lDihSuym3cJ00=
-
-Name: plugin.properties
-SHA1-Digest: mL9yvXBmAAJi7G1tls7akuyPG+A=
-
-Name: about.html
-SHA1-Digest: UFe6k4Ad9XpZmuWF46WW3vk9dVA=
-
-Name: META-INF/eclipse.inf
-SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=
-
-Name: about_files/cpl-v10.html
-SHA1-Digest: o0b19ceZ+HQHVX0Ops751AQVdwM=
-

55
eclipse-osgi-classpath.patch Normal file
View File

@ -0,0 +1,55 @@
--- plugins/org.eclipse.osgi/build.xml.orig 2008-09-25 15:28:47.000000000 +1000
+++ plugins/org.eclipse.osgi/build.xml 2008-09-25 15:54:08.000000000 +1000
@@ -16,18 +16,36 @@
<property name="compilerArg" value=""/>
<property name="javacSource" value="1.3"/>
<property name="javacTarget" value="1.2"/>
- <property name="bundleBootClasspath" value="osgi/exceptions.jar;osgi/xmlParserAPIs.jar;${CDC-1.0/Foundation-1.0}"/>
+ <condition property="dir_bootclasspath" value="${java.home}/../Classes">
+ <os family="mac"/>
+ </condition>
+ <property name="dir_bootclasspath" value="${java.home}/lib"/>
+ <path id="path_bootclasspath">
+ <fileset dir="${dir_bootclasspath}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+ <property name="bootclasspath" refid="path_bootclasspath"/>
+<condition property="bundleBootClasspath" value="${J2SE-1.4}" >
+ <isset property="J2SE-1.4"/>
+ </condition>
<condition property="bundleJavacSource" value="1.3" >
- <isset property="CDC-1.0/Foundation-1.0"/>
+ <isset property="J2SE-1.4"/>
+ </condition>
+<condition property="bundleJavacTarget" value="1.2" >
+ <isset property="J2SE-1.4"/>
</condition>
-<condition property="bundleJavacTarget" value="1.1" >
- <isset property="CDC-1.0/Foundation-1.0"/>
+<condition property="bundleBootClasspath" value="${J2SE-1.4}" >
+ <isset property="J2SE-1.4"/>
</condition>
-<condition property="bundleJavacSource" value="1.5" >
- <isset property="J2SE-1.5"/>
+<condition property="bundleJavacSource" value="1.3" >
+ <isset property="J2SE-1.4"/>
+ </condition>
+<condition property="bundleJavacTarget" value="1.2" >
+ <isset property="J2SE-1.4"/>
</condition>
-<condition property="bundleJavacTarget" value="1.5" >
- <isset property="J2SE-1.5"/>
+<condition property="bundleBootClasspath" value="${OSGi/Minimum-1.1}" >
+ <isset property="OSGi/Minimum-1.1"/>
</condition>
<condition property="bundleJavacSource" value="1.3" >
<isset property="OSGi/Minimum-1.1"/>
@@ -37,6 +55,7 @@
</condition>
<property name="bundleJavacSource" value="${javacSource}"/>
<property name="bundleJavacTarget" value="${javacTarget}"/>
+ <property name="bundleBootClasspath" value="${bootclasspath}"/>
<target name="init" depends="properties">
<condition property="pluginTemp" value="${buildTempFolder}/plugins" >

39
eclipse.spec
View File

@ -4,13 +4,15 @@
# - get Ganymede update site pre-configured
# - investigate bi-arch requirements
# - see why about.html isn't being copied on ppc
# - fix ant libs
# - update fedora feature version
Epoch: 1
%define eclipse_major 3
%define eclipse_minor 4
%define eclipse_majmin %{eclipse_major}.%{eclipse_minor}
%define eclipse_micro 0
%define swtver 3.4.0.v3448f
%define eclipse_micro 1
%define swtver 3.4.1.v3449c
# All arches line up between Eclipse and Linux kernel names except i386 -> x86
%ifarch %{ix86}
@ -22,11 +24,11 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 24%{?dist}
Release: 0%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.4-200806172000/eclipse-sourceBuild-srcIncluded-3.4.zip
Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.4.1-200809111700/eclipse-sourceBuild-srcIncluded-3.4.1.zip
Source2: %{name}.desktop
#Source3: eclipse.in
# cvs -d :pserver:anonymous@sources.redhat.com:/cvs/eclipse export \
@ -34,7 +36,9 @@ Source2: %{name}.desktop
# cd branding
# zip -r org.fedoraproject.ide.platform-3.4.0-1.zip \
# org.fedoraproject.ide.platform
Source4: org.fedoraproject.ide.platform-%{version}-1.zip
#TODO fix version
#Source4: org.fedoraproject.ide.platform-%{version}-1.zip
Source4: org.fedoraproject.ide.platform-3.4.0-1.zip
# cvs -d :pserver:anonymous@sources.redhat.com:/cvs/eclipse export \
# -r fedoraeclipsefeature-1_0_0 branding/org.fedoraproject.ide-feature
# cd branding
@ -82,7 +86,7 @@ Source29: %{name}-ecj-gcj.tar.bz2
# org.eclipse.ant.optional.junit
# tar cjf %{name}-%{version}-testframework.tar.bz2 \
# %{name}-%{version}-testframework
# (generated 2008-08-27)
# (generated 2008-10-03)
Source30: %{name}-%{version}-testframework.tar.bz2
# Build swttools.jar before generation on 64-bit platforms.
@ -124,11 +128,6 @@ Patch29: %{name}-memorypermsizeandjvmcrash.patch
Patch31: %{name}-ia64-packaging.patch
# FIXME: file these upstream
# Upstream builds with a 1.4 (or lower) class library
Patch33: %{name}-pdeapicasting.patch
Patch34: %{name}-pdeapicasting-ui.patch
# Make ECF bundles have the same qualifier as they do upstream
Patch35: %{name}-ecf-qualifier.patch
@ -152,6 +151,8 @@ Patch41: %{name}-nowin32testfragment.patch
# FIXME: submit upstream
Patch42: %{name}-tests-libraryXml.patch
Patch43: %{name}-osgi-classpath.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant
BuildRequires: jpackage-utils >= 0:1.5, make, gcc
@ -306,6 +307,7 @@ developing Eclipse plugins.
%setup -q -c
sed --in-place "s/java5.home/java.home/" build.xml
sed --in-place "s|JavaSE-1.6=|JavaSE-1.6=%{java_home}|" build.xml
# Build swttools.jar and native libraries
%patch4 -p0
%patch32 -p0
@ -367,13 +369,6 @@ mv gtk/eclipse.ini{,.patched}
mv gtk/eclipse.ini{.orig,}
popd
pushd plugins/org.eclipse.pde.api.tools
%patch33
popd
pushd plugins/org.eclipse.pde.api.tools.ui
%patch34
popd
%patch36
%patch37
@ -659,6 +654,8 @@ pushd %{name}-%{version}-testframework
sed -i "s:/usr/lib/eclipse:%{_libdir}/%{name}:" org.eclipse.test/library.xml
popd
%patch43
%build
ORIGCLASSPATH=$CLASSPATH
@ -1516,6 +1513,12 @@ fi
%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
* Thu Oct 03 2008 Alexander Kurtakov <akurtako@redhat.com> 3.4.1-0
- 3.4.1
- Update nojarsignatures patch.
- Added osgi-classpath.patch fixes broken bootclasspath (Sean Flanigan).
- Removed patches 33 and 34 - not needed anymore.
* Thu Sep 25 2008 Michal Nowak <mnowak@redhat.com> 3.4.0-24
- exclude parts of eclipse-pydev from JIT compilation
- Resolves: bug 461860

2
sources
View File

@ -5,3 +5,5 @@ e1313563c7e36aa46e33789a1386b815 eclipse-fileinitializerapp.tar.bz2
555c99aee06fc52d2ec03995b5ac0710 eclipse-sourceBuild-srcIncluded-3.4.zip
28c8d625ea1af348cfc592369d52284c org.fedoraproject.ide.feature-1.0.0.zip
372361ae6f1355ec5cfb9a301ad690f5 org.fedoraproject.ide.platform-3.4.0-1.zip
5814fb2019f70f00c0952f29df1cac3d eclipse-sourceBuild-srcIncluded-3.4.1.zip
12f447b8b8df93ac2f4d97adb61c5c6f eclipse-3.4.1-testframework.tar.bz2