From 475caa030bac039dcb8f517afae218f237500530 Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Tue, 12 Feb 2013 12:32:06 +0100 Subject: [PATCH] Ability to use sclized icu4j. --- eclipse.spec | 13 ++++++++----- sources | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/eclipse.spec b/eclipse.spec index b45930a..a2d9e07 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -9,7 +9,7 @@ Epoch: 1 %global eclipse_majmin %{eclipse_major}.%{eclipse_minor} %global eclipse_micro 0 %global initialize 1 -%global eb_commit 05cdd09dcef5eef6723cc1c5cff3ff0adc3fcece +%global eb_commit c95d70019836e224cf70a7f887d0f49f18af6b8a %global build_id I20130128-1400 %global eclipse_version %{eclipse_majmin}.%{eclipse_micro} %global installation_loc %{_libdir}/%{pkg_name} @@ -55,7 +55,7 @@ fi; Summary: An open, extensible IDE Name: %{?scl_prefix}eclipse Version: %{eclipse_version} -Release: 0.10.git201301281400%{?dist} +Release: 0.11.git201301281400%{?dist} License: EPL Group: Development/Tools URL: http://www.eclipse.org/ @@ -155,7 +155,7 @@ BuildRequires: java-javadoc >= 1:1.7.0 BuildRequires: libXt-devel BuildRequires: webkitgtk-devel BuildRequires: geronimo-annotation >= 1.0-7 -BuildRequires: icu4j-eclipse >= 1:4.4.2.2-11 +BuildRequires: %{?scl_prefix}icu4j-eclipse >= 1:50 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net BuildRequires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf BuildRequires: ant-scripts @@ -261,7 +261,7 @@ Requires: eclipse-emf-core >= 2.8.1 Requires: tomcat-servlet-3.0-api Requires: glassfish-jsp-api >= 2.2.1-4 Requires: glassfish-jsp >= 2.2.5 -Requires: icu4j-eclipse >= 1:4.4.2.2-11 +Requires: %{?scl_prefix}icu4j-eclipse >= 1:50 Requires: %{name}-swt = %{epoch}:%{eclipse_version}-%{release} Requires: %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release} %{?scl:Requires: %scl_runtime} @@ -508,7 +508,7 @@ mvn-rpmbuild clean install \ #symlink necessary plugins (that are provided by other packages) dependencies/./replace_platform_plugins_with_symlinks.sh \ - eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse + eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse %{_javadir} #ant again ./dependencies/./fake_ant_dependency.sh \ eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse/plugins/org.apache.ant_* %{_javadir} \ @@ -1010,6 +1010,9 @@ echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{ %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_* %changelog +* Tue Feb 12 2013 Krzysztof Daniel 1:4.3.0-0.11.git201301281400 +- Ability to use sclized icu4j. + * Mon Feb 11 2013 Krzysztof Daniel 1:4.3.0-0.10.git201301281400 - Yet another rebuild with latest icu4j. diff --git a/sources b/sources index ae9240e..dbed4d4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -57203caa34995bb3dae73dcd2efd2540 eclipse-build-05cdd09dcef5eef6723cc1c5cff3ff0adc3fcece.tar.xz +b1b201c168740230a93936552124f2cd eclipse-build-c95d70019836e224cf70a7f887d0f49f18af6b8a.tar.xz be15c4f75e20fb30b4aaa6d3354b7683 eclipse-source.tar.bz2