diff --git a/sources b/sources index 26718ab..4a92d55 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 3c1629e532861686aa3b01eb55b17575 fedoraproject-p2-9a996d.tar.xz 127267aa75abd86df6815bcbd7f2492d tycho-0.21.0.tar.bz2 -df988e4679b2f7364a5d171544c7449a eclipse-bootstrap.tar.xz +c600a5115f29962c974b75b4b25e74f1 eclipse-bootstrap.tar.xz diff --git a/tycho.spec b/tycho.spec index bf760c4..4c48157 100644 --- a/tycho.spec +++ b/tycho.spec @@ -88,8 +88,7 @@ BuildRequires: %{name} %endif %if %{eclipse_bootstrap} # Dependencies for Eclipse bundles we use -# icu4j-eclipse is noarch but buildroots might need to build it -#BuildRequires: icu4j-eclipse +BuildRequires: icu4j-eclipse BuildRequires: geronimo-annotation BuildRequires: sac BuildRequires: sat4j @@ -404,12 +403,6 @@ echo ' install -pm 644 JPP.tycho-osgi.compatibility.state.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.tycho-osgi.compatibility.state.pom install -m 644 $osgiStateJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.compatibility.state.jar %add_maven_depmap JPP.%{name}-osgi.compatibility.state.pom %{name}/osgi.compatibility.state.jar -a "org.eclipse.tycho:org.eclipse.osgi.compatibility.state" - -# com.ibm.icu -icu4jJarPath=`find "bootstrap" -name "com.ibm.icu_*.jar"` - -install -m 644 $icu4jJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/com.ibm.icu.jar - %endif # Symlink XMvn P2 plugin with all dependencies so that it can be loaded by XMvn @@ -423,9 +416,6 @@ ln -s %{_javadir}/%{name}/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/ %{_datadir}/xmvn/lib/installer/* %{_javadir}-utils/p2-install.sh %doc README.md -%if %{eclipse_bootstrap} -%{_javadir}/%{name}/com.ibm.icu.jar -%endif %files javadoc %{_javadocdir}/%{name}