diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch index 126526f..b0690cc 100644 --- a/eclipse-no-source-for-dependencies.patch +++ b/eclipse-no-source-for-dependencies.patch @@ -33,7 +33,7 @@ + + -+ ++ + + + diff --git a/eclipse.spec b/eclipse.spec index b50651f..863edb0 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -12,7 +12,7 @@ Epoch: 1 %global eclipse_major 4 %global eclipse_minor 4 %global eclipse_micro 0 -%global eb_commit 2da2dea04ec2c827e1f5e6567fa06fe78ca67fa0 +%global eb_commit db6b9cd54787feb7cf7c7a28c80e740340213bd3 %global eclipse_tag R4_4 %global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro} %global _jetty_version 9.2.1 @@ -22,7 +22,7 @@ Epoch: 1 %endif %ifarch %{arm} %define eclipse_arch arm -%endif +%endif %ifarch ppc64 ppc64p7 %define eclipse_arch ppc64 %endif @@ -38,7 +38,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: %{?scl_prefix}eclipse Version: %{eclipse_version} -Release: 7%{?dist} +Release: 8%{?dist} License: EPL Group: Development/Tools URL: http://www.eclipse.org/ @@ -153,10 +153,10 @@ BuildRequires: %{?scl_prefix}lucene-analysis >= 4.8.1-3 BuildRequires: junit >= 4.10-5 BuildRequires: hamcrest >= 0:1.1-11 BuildRequires: %{?scl_prefix}sat4j >= 2.3.5-1 -BuildRequires: %{?scl_prefix}objectweb-asm >= 5.0.1-1 +BuildRequires: %{?scl_prefix}objectweb-asm >= 5.0.2-2 BuildRequires: zip BuildRequires: sac >= 1.3-12 -BuildRequires: batik >= 1.8 +BuildRequires: batik >= 1.8 BuildRequires: xml-commons-apis >= 1.4.01-12 BuildRequires: atinject >= 1-6 BuildRequires: tycho >= 0.19 @@ -225,8 +225,8 @@ Requires: %{?scl_prefix}lucene-core >= 4.8.1-3 Requires: %{?scl_prefix}lucene-analysis >= 4.8.1-3 Requires: %{?scl_prefix}sat4j >= 2.3.5-1 Requires: sac >= 1.3-12 -Requires: xml-commons-apis >= 1.4.01-12 Requires: batik >= 1.8 +Requires: xml-commons-apis >= 1.4.01-12 Requires: atinject >= 1-6 Requires: geronimo-annotation >= 1.0-7 Requires: eclipse-ecf-core >= 3.8.1-1 @@ -264,7 +264,7 @@ Group: Development/Tools Provides: %{name} = %{epoch}:%{eclipse_version}-%{release} Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release} Requires: %{name}-jdt = %{epoch}:%{eclipse_version}-%{release} -Requires: %{?scl_prefix}objectweb-asm >= 5.0.1-1 +Requires: %{?scl_prefix}objectweb-asm >= 5.0.2-2 # For PDE Build wrapper script + creating jars Requires: zip Requires: bash @@ -289,7 +289,7 @@ installer UIs. Summary: Eclipse Tests Group: Development/Tools Requires: %{name}-pde = %{epoch}:%{eclipse_version}-%{release} -Requires: %{?scl_prefix}easymock3 +Requires: easymock3 Requires: mockito %description tests @@ -471,6 +471,9 @@ sed -i 's/javax\.el/com\.sun\.el\.javax\.el/' \ eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml \ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml +# Use javax.servlet-api (Glassfish) instead of javax.servlet (Tomcat) +find -name feature.xml | xargs sed -i -e 's|"javax.servlet"|"javax.servlet-api"|' + # Bump javax.servlet Import-Package statements sed -i '/javax\.servlet/ s/3\.1/3\.2/' rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF sed -i '/javax\.servlet/ s/3\.1/3\.2/' rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF @@ -494,9 +497,6 @@ xmvn -o clean verify \ -Dtycho.local.keepTarget -DbuildId=`echo "%{release}" | tr -d "."` \ -Dtargets=install -Ddirector.running.env.only=true -#symlink necessary plugins (that are provided by other packages) -dependencies/replace_platform_plugins_with_symlinks.sh \ - eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse %{_javadir} #ant again dependencies/fake_ant_dependency.sh \ eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse/plugins/org.apache.ant_* \ @@ -509,27 +509,12 @@ utils/move_JDT_PDE_to_dropins.sh \ `pwd`/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository \ "jdt cvs equinox.p2.discovery.feature sdk" +# Symlink necessary plugins that are provided by other packages +dependencies/replace_platform_plugins_with_symlinks.sh \ + eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse %{_javadir} + pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse -# This is a temporary hack -# We offer javax.servlet and javax.servlet-api as the same bundle -# References to javax.servlet should be renamed -pushd plugins - f=`ls | grep -e "^javax.servlet-api_"` - rm -f $f - ln -s %{_javadir}/glassfish-servlet-api.jar $f -popd - -#in jdt -pushd dropins/jdt/plugins - f=`ls | grep -e "^org.hamcrest.core_"` - rm -rf $f - ln -s %{_javadir}/hamcrest/core.jar ${f%.jar}.jar - f=`ls | grep -e "^org.junit_4"` - rm -rf $f - ln -s %{_javadir}/junit.jar ${f%.jar}.jar -popd - #clean up rm -rf configuration/org.eclipse.core.runtime rm -rf configuration/org.eclipse.equinox.app @@ -805,11 +790,9 @@ fi %{_libdir}/%{pkg_name}/features/org.eclipse.emf.common_* %{_libdir}/%{pkg_name}/features/org.eclipse.emf.ecore_* %{_libdir}/%{pkg_name}/features/org.eclipse.rcp.configuration_* -%{_libdir}/%{pkg_name}/plugins/asm* %{_libdir}/%{pkg_name}/plugins/com.ibm.icu_* %{_libdir}/%{pkg_name}/plugins/com.jcraft.jsch_* %{_libdir}/%{pkg_name}/plugins/javax.servlet-api_* -%{_libdir}/%{pkg_name}/plugins/javax.servlet_* %{_libdir}/%{pkg_name}/plugins/javax.servlet.jsp_* %{_libdir}/%{pkg_name}/plugins/javax.xml_* %{_libdir}/%{pkg_name}/plugins/com.sun.el.javax.el_* @@ -1027,6 +1010,10 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_* %changelog +* Wed Jul 16 2014 Mat Booth - 1:4.4.0-8 +- Update eclipse-build snapshot +- Tighten up deps on asm + * Tue Jul 15 2014 Mat Booth - 1:4.4.0-7 - Add appstream addon metadata for JDT and PDE plugins - Only use GTK3 by default on F22 or newer, rhbz1118317 diff --git a/sources b/sources index 406093e..1fcb082 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d1e37d9af6848edbdd54d5988c77fa58 R4_platform-aggregator-R4_4.tar.xz -24a3b316248be49e449515c56a48e3f3 org.eclipse.linuxtools.eclipse-build-2da2dea04ec2c827e1f5e6567fa06fe78ca67fa0.tar.bz2 +b5c946f8de3fb487cf9f385a0ae707e2 org.eclipse.linuxtools.eclipse-build-db6b9cd54787feb7cf7c7a28c80e740340213bd3.tar.bz2