Update e-b snapshot for updated ant dependency
This commit is contained in:
parent
467bdc5dca
commit
230ce848b8
34
eclipse.spec
34
eclipse.spec
@ -11,7 +11,7 @@ Epoch: 1
|
|||||||
%global eclipse_major 4
|
%global eclipse_major 4
|
||||||
%global eclipse_minor 5
|
%global eclipse_minor 5
|
||||||
%global eclipse_micro 2
|
%global eclipse_micro 2
|
||||||
%global eb_commit 73dbcff39b0e10cc61d6d5d3a8527d976af8bba8
|
%global eb_commit a504d79f37ec4e8d9d57782fbaa9925fbad80e84
|
||||||
%global eclipse_tag S4_5_2_RC4
|
%global eclipse_tag S4_5_2_RC4
|
||||||
%global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
|
%global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
|
||||||
|
|
||||||
@ -49,7 +49,7 @@ Epoch: 1
|
|||||||
Summary: An open, extensible IDE
|
Summary: An open, extensible IDE
|
||||||
Name: eclipse
|
Name: eclipse
|
||||||
Version: %{eclipse_version}
|
Version: %{eclipse_version}
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
License: EPL
|
License: EPL
|
||||||
URL: http://www.eclipse.org/
|
URL: http://www.eclipse.org/
|
||||||
|
|
||||||
@ -582,7 +582,7 @@ sed -i '/machine_gtk3/d' eclipse.platform.swt.binaries/bundles/org.eclipse.swt.g
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
#fake dependencies that don't exist in fedora
|
#fake dependencies that don't exist in fedora
|
||||||
./dependencies/./fake_ant_dependency.sh .m2/p2/repo-sdk/plugins/org.apache.ant_* /usr/share/java /usr/bin -makejar
|
./dependencies/fake_ant_dependency.sh .m2/p2/repo-sdk/plugins/org.apache.ant_* -makejar
|
||||||
|
|
||||||
# Allow usage of javax.servlet.jsp 2.3.
|
# Allow usage of javax.servlet.jsp 2.3.
|
||||||
sed -i '/javax\.servlet\.jsp/ s/2\.3/2\.4/' rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
|
sed -i '/javax\.servlet\.jsp/ s/2\.3/2\.4/' rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
|
||||||
@ -638,23 +638,22 @@ export JAVA_HOME=%{java_home}
|
|||||||
-Dtycho.local.keepTarget \
|
-Dtycho.local.keepTarget \
|
||||||
-Dfedora.p2.repos=`pwd`/.m2/p2/repo-sdk/plugins -DbuildType=Z
|
-Dfedora.p2.repos=`pwd`/.m2/p2/repo-sdk/plugins -DbuildType=Z
|
||||||
|
|
||||||
|
# Location that the product is materialised
|
||||||
|
product="eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}"
|
||||||
|
|
||||||
#ant again
|
#ant again
|
||||||
dependencies/fake_ant_dependency.sh \
|
dependencies/fake_ant_dependency.sh $product/eclipse/plugins/org.apache.ant_*
|
||||||
eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse/plugins/org.apache.ant_* \
|
|
||||||
/usr/share/java /usr/bin
|
|
||||||
|
|
||||||
# JDT and PDE are built as update sites.
|
# JDT and PDE are built as update sites.
|
||||||
# Initialize them and move into dropins.
|
# Initialize them and move into dropins.
|
||||||
utils/move_JDT_PDE_to_dropins.sh \
|
utils/move_JDT_PDE_to_dropins.sh $product/ \
|
||||||
eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/ \
|
|
||||||
`pwd`/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository \
|
`pwd`/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository \
|
||||||
"jdt cvs sdk"
|
"jdt cvs sdk"
|
||||||
|
|
||||||
# Symlink necessary plugins that are provided by other packages
|
# Symlink necessary plugins that are provided by other packages
|
||||||
dependencies/replace_platform_plugins_with_symlinks.sh \
|
dependencies/replace_platform_plugins_with_symlinks.sh $product/eclipse %{_javadir}
|
||||||
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
|
pushd $product/eclipse
|
||||||
|
|
||||||
#clean up
|
#clean up
|
||||||
rm -rf configuration/org.eclipse.core.runtime
|
rm -rf configuration/org.eclipse.core.runtime
|
||||||
@ -801,11 +800,11 @@ for J in $EQUINOX_JARS $OSGI_JARS core.contenttype core.jobs core.net core.runti
|
|||||||
done
|
done
|
||||||
|
|
||||||
# Install Maven metadata for OSGi jars
|
# Install Maven metadata for OSGi jars
|
||||||
%add_maven_depmap JPP.eclipse-osgi.pom %{pkg_name}/osgi.jar -a "org.eclipse:osgi,org.eclipse.tycho:org.eclipse.osgi" -f equinox-osgi
|
%add_maven_depmap JPP.eclipse-osgi.pom eclipse/osgi.jar -a "org.eclipse:osgi,org.eclipse.tycho:org.eclipse.osgi" -f equinox-osgi
|
||||||
%add_maven_depmap JPP.eclipse-osgi.compatibility.state.pom %{pkg_name}/osgi.compatibility.state.jar -a "org.eclipse.osgi:compatibility.state,org.eclipse.tycho:org.eclipse.osgi.compatibility.state" -f equinox-osgi
|
%add_maven_depmap JPP.eclipse-osgi.compatibility.state.pom eclipse/osgi.compatibility.state.jar -a "org.eclipse.osgi:compatibility.state,org.eclipse.tycho:org.eclipse.osgi.compatibility.state" -f equinox-osgi
|
||||||
%add_maven_depmap JPP.eclipse-osgi.services.pom %{pkg_name}/osgi.services.jar -a "org.eclipse.osgi:services" -f equinox-osgi
|
%add_maven_depmap JPP.eclipse-osgi.services.pom eclipse/osgi.services.jar -a "org.eclipse.osgi:services" -f equinox-osgi
|
||||||
%add_maven_depmap JPP.eclipse-osgi.util.pom %{pkg_name}/osgi.util.jar -a "org.eclipse.osgi:util" -f equinox-osgi
|
%add_maven_depmap JPP.eclipse-osgi.util.pom eclipse/osgi.util.jar -a "org.eclipse.osgi:util" -f equinox-osgi
|
||||||
%add_maven_depmap JPP.eclipse-equinox.http.servlet.pom %{pkg_name}/equinox.http.servlet.jar -a "org.eclipse.equinox.http:servlet" -f platform
|
%add_maven_depmap JPP.eclipse-equinox.http.servlet.pom eclipse/equinox.http.servlet.jar -a "org.eclipse.equinox.http:servlet" -f platform
|
||||||
# Maven metadata for SWT (no POM)
|
# Maven metadata for SWT (no POM)
|
||||||
VER=$(echo $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.swt_*.jar | sed -e "s/.*_\(.*\)\.jar/\1/")
|
VER=$(echo $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.swt_*.jar | sed -e "s/.*_\(.*\)\.jar/\1/")
|
||||||
%add_maven_depmap org.eclipse.swt:org.eclipse.swt:$VER swt.jar -a org.eclipse.swt:swt -f swt
|
%add_maven_depmap org.eclipse.swt:org.eclipse.swt:$VER swt.jar -a org.eclipse.swt:swt -f swt
|
||||||
@ -1138,6 +1137,9 @@ fi
|
|||||||
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
|
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Mar 25 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-7
|
||||||
|
- Update e-b snapshot for updated ant dependency
|
||||||
|
|
||||||
* Thu Mar 24 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-6
|
* Thu Mar 24 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-6
|
||||||
- Fix failure to run tests and backport patch for ebz#489953 in order to fix
|
- Fix failure to run tests and backport patch for ebz#489953 in order to fix
|
||||||
some unit tests
|
some unit tests
|
||||||
|
2
sources
2
sources
@ -1,2 +1,2 @@
|
|||||||
74b34525c70e6f244554af6b28731c78 R4_platform-aggregator-S4_5_2_RC4.tar.xz
|
74b34525c70e6f244554af6b28731c78 R4_platform-aggregator-S4_5_2_RC4.tar.xz
|
||||||
2e5f505c39e60be51e0c10e0c4208494 org.eclipse.linuxtools.eclipse-build-73dbcff39b0e10cc61d6d5d3a8527d976af8bba8.tar.xz
|
471dbb24aea61f3b84d3c8c3d9bd126a org.eclipse.linuxtools.eclipse-build-a504d79f37ec4e8d9d57782fbaa9925fbad80e84.tar.xz
|
||||||
|
Loading…
Reference in New Issue
Block a user