rpms/eclipse/devel sources,1.76,1.77 eclipse.spec,1.656,1.657

Alexander Kurtakov akurtakov at fedoraproject.org
Tue Aug 11 16:44:00 UTC 2009 

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv872/devel

Modified Files:
	sources eclipse.spec 
Log Message:
- Fix sources url.
- Make it use system icu4j and sat4j.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	6 Aug 2009 15:57:33 -0000	1.76
+++ sources	11 Aug 2009 16:43:59 -0000	1.77
@@ -1,8 +1,5 @@
 611d3dc63e9e4246e325848d32773132  ecf-filetransfer-v20080611-1715.tar.bz2
 e1313563c7e36aa46e33789a1386b815  eclipse-fileinitializerapp.tar.bz2
-3e031f11b0de3f15b00233deec2b19f3  eclipse-3.4.2-testframework.tar.bz2
-1c3bb4e384cbc5f4e2b7275238a010f7  eclipse-sourceBuild-srcIncluded-I20090416-1053.zip
 72a590190a4fea7a4f8885bfe26a3e18  eclipse-I20090611-1540-fetched-src.tar.bz2
 67c8679981ee3020ec2709d85cfaf4b1  eclipse-3.5.0-testframework.tar.bz2
-047b352b07b04f7f8e96afb81e69862c  eclipse-build-generatedScripts.tar.bz2
-fed4220be8e4db0743365cfadac65d2e  eclipse-build-R0_0_2_1.tar.gz
+a3504fedff088a6e58a39d43fff4d47e  eclipse-build-R0_3_0.tar.gz


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.656
retrieving revision 1.657
diff -u -p -r1.656 -r1.657
--- eclipse.spec	7 Aug 2009 16:21:31 -0000	1.656
+++ eclipse.spec	11 Aug 2009 16:44:00 -0000	1.657
@@ -12,6 +12,7 @@ Epoch:  1
 %define eclipse_micro   0
 %define swtver          3.5.0.v3550
 %define initialize      1
+%global download_url    http://download.eclipse.org/technology/linuxtools/eclipse-build/
 
 # All arches line up between Eclipse and Linux kernel names except i386 -> x86
 %ifarch %{ix86}
@@ -29,15 +30,13 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.3.35%{?dist}
+Release:        0.4.0%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0:        eclipse-build-R0_0_2_1.tar.gz
-Source1:        eclipse-I20090611-1540-fetched-src.tar.bz2
+Source0:        %{download_url}eclipse-build-R0_3_0.tar.gz
+Source1:        %{download_url}eclipse-I20090611-1540-fetched-src.tar.bz2
 Source2:        %{name}.desktop
-Source3:        eclipse-build-generatedScripts.tar.bz2
-#Source3:        eclipse.in
 Source16:       %{name}-copy-platform.sh
 Source17:       efj.sh.in
 # This file contains the types of files we'd like to extract from the jars
@@ -168,7 +167,7 @@ BuildRequires:  mesa-libGL-devel
 BuildRequires:  mesa-libGLU-devel
 BuildRequires:  cairo >= 1.0
 BuildRequires:  unzip
-BuildRequires:  icu4j-eclipse >= 4.0.1
+BuildRequires:  icu4j-eclipse >= 4.0.1-3
 BuildRequires:  tomcat5-jasper-eclipse >= 5.5.27-6.3
 BuildRequires:  tomcat6-servlet-2.5-api >= 6.0.18-9.2
 BuildRequires:  desktop-file-utils
@@ -192,7 +191,7 @@ BuildRequires: lucene-contrib >= 2.3.1-3
 BuildRequires: regexp
 BuildRequires: junit >= 3.8.1-3jpp
 BuildRequires: junit4
-BuildRequires: sat4j >= 2.1.0
+BuildRequires: sat4j >= 2.1.0-1
 BuildRequires: objectweb-asm
 
 %description
@@ -223,7 +222,7 @@ Requires:       %{name}-swt = %{epoch}:%
 # FIXME:  investigate.  Can we just add a %{arch} to the above?
 ## This file-level requirement is for the bi-arch multilib case
 #Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar
-Requires:       icu4j-eclipse >= 4.0.1
+Requires:       icu4j-eclipse >= 4.0.1-3
 Requires:       java >= 1.6.0
 
 %description    rcp
@@ -249,7 +248,7 @@ Requires: jsch >= 0.1.41
 Requires: lucene >= 2.3.1-3.4
 Requires: lucene-contrib >= 2.3.1-3.4
 Requires: regexp
-Requires: sat4j >= 2.1.0
+Requires: sat4j >= 2.1.0-1
 Provides: eclipse-cvs-client = 1:%{version}-%{release}
 Obsoletes: eclipse-cvs-client < 1:3.3.2-20
 
@@ -293,9 +292,8 @@ Eclipse Plugin Development Environment. 
 developing Eclipse plugins.
 
 %prep
-%setup -q -n eclipse-build-R0_0_2_1
+%setup -q -n eclipse-build-R0_3_0
 cp %{SOURCE1} .
-cp %{SOURCE3} .
 sed --in-place "s/<target name=\"build\" depends=\"applyPatches,bootstrap,compilelibs\">/<target name=\"build\" depends=\"bootstrap,compilelibs\">/" build.xml
 ant -DbuildId=I20090611-1540 applyPatches 
 pushd build/eclipse-I20090611-1540-fetched-src
@@ -484,9 +482,9 @@ done
 popd
 
 # Symlinks
-#rm plugins/org.sat4j*
-#ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar
-#ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.1.0.v20090520.jar
+rm plugins/org.sat4j*
+ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar
+ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.1.0.v20090520.jar
 
 ASMPLUGINVERSION=$(ls plugins | grep org.objectweb.asm_ | \
   sed 's/org.objectweb.asm_//')
@@ -542,9 +540,9 @@ rm plugins/com.jcraft.jsch_*.jar
 ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_$JSCHVERSION
 
 # link to the icu4j stuff
-#ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
-#rm plugins/com.ibm.icu_*.jar
-#ln -s %{_libdir}/eclipse/plugins/com.ibm.icu_*.jar plugins/com.ibm.icu_$ICUVERSION
+ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
+rm plugins/com.ibm.icu_*.jar
+ln -s %{_libdir}/eclipse/plugins/com.ibm.icu_*.jar plugins/com.ibm.icu_$ICUVERSION
 
 # link to lucene
 LUCENEVERSION=$(ls plugins | grep org.apache.lucene_ | \
@@ -650,8 +648,6 @@ tar jxf %{SOURCE20}
 
 # Test framework
 tar jxf %{SOURCE30}
-# TODO regenerate testframework once 3.5 is out
-#pushd %{name}-%{version}-testframework
 pushd %{name}-%{version}-testframework
 %patch41
 pushd org.eclipse.test
@@ -1118,9 +1114,9 @@ sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVER
   $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
 
 pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
-#rm plugins/org.sat4j*
-#ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar
-#ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.1.0.v20090520.jar
+rm plugins/org.sat4j*
+ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar
+ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.1.0.v20090520.jar
 
 ASMPLUGINVERSION=$(ls dropins/sdk/plugins | grep org.objectweb.asm_ | \
   sed 's/org.objectweb.asm_//')
@@ -1175,8 +1171,8 @@ rm plugins/com.jcraft.jsch_$JSCHVERSION
 ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_$JSCHVERSION
 
 # link to the icu4j stuff
-#ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
-#rm plugins/com.ibm.icu_*.jar
+ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
+rm plugins/com.ibm.icu_*.jar
 
 # link to lucene
 LUCENEVERSION=$(ls plugins | grep org.apache.lucene_ | \
@@ -1301,7 +1297,6 @@ fi
 %{_libdir}/%{name}/readme
 %{_libdir}/%{name}/startup.jar
 %{_libdir}/%{name}/features/org.eclipse.rcp_*
-%{_libdir}/%{name}/plugins/com.ibm.icu_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.commands_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.contenttype_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.databinding_*
@@ -1493,6 +1488,10 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Aug 11 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.4.0
+- Fix sources url.
+- Make it use system icu4j and sat4j.
+
 * Fri Aug 7 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.35
 - Another missing ppc64 fragment.

More information about the fedora-extras-commits mailing list