Package the equinox.p2.discovery feature, obsolete the separate package
- Update e-b snapshot - BR/R: gogo-command >= 0.14 - Symlink mockito to system jar in testing package
This commit is contained in:
Mat Booth
parent
5c932a3a60
commit
5b778ad345
|
|
@ -1,5 +1,5 @@
|
|||
--- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak.orig" 2014-03-12 10:43:26.000000000 +0000
|
||||
+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak" 2014-03-12 14:36:44.130938292 +0000
|
||||
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak.orig 2014-03-12 10:43:26.000000000 +0000
|
||||
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 2014-03-12 14:36:44.130938292 +0000
|
||||
@@ -115,7 +115,7 @@
|
||||
WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o
|
||||
GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
|
||||
|
|
|
|||
54
eclipse.spec
54
eclipse.spec
|
|
@ -13,7 +13,7 @@ Epoch: 1
|
|||
%global eclipse_major 4
|
||||
%global eclipse_minor 4
|
||||
%global eclipse_micro 0
|
||||
%global eb_commit 93cece6ca02e022b0d8d0816a9f6596b311ab774
|
||||
%global eb_commit b95311b1c90288893e23fdd8d13373aba80a8e6b
|
||||
%global eclipse_tag R4_4
|
||||
%global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
|
||||
%global _jetty_version 9.2.1
|
||||
|
|
@ -39,7 +39,7 @@ Epoch: 1
|
|||
Summary: An open, extensible IDE
|
||||
Name: %{?scl_prefix}eclipse
|
||||
Version: %{eclipse_version}
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
License: EPL
|
||||
Group: Development/Tools
|
||||
URL: http://www.eclipse.org/
|
||||
|
|
@ -137,7 +137,7 @@ BuildRequires: jsch >= 0:0.1.46-2
|
|||
BuildRequires: apache-commons-el >= 1.0-22
|
||||
BuildRequires: apache-commons-logging
|
||||
BuildRequires: apache-commons-codec >= 1.6-2
|
||||
BuildRequires: felix-gogo-command >= 0.12
|
||||
BuildRequires: felix-gogo-command >= 0.14.0-2
|
||||
BuildRequires: felix-gogo-shell >= 0.10.0-3
|
||||
BuildRequires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
|
||||
BuildRequires: osgi(org.eclipse.jetty.server) >= %{_jetty_version}
|
||||
|
|
@ -209,7 +209,7 @@ Requires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant
|
|||
Requires: apache-commons-el >= 1.0-23
|
||||
Requires: apache-commons-logging
|
||||
Requires: apache-commons-codec >= 1.6-2
|
||||
Requires: felix-gogo-command >= 0.12
|
||||
Requires: felix-gogo-command >= 0.14.0-2
|
||||
Requires: felix-gogo-shell >= 0.10.0-3
|
||||
Requires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
|
||||
Requires: osgi(org.eclipse.jetty.server) >= %{_jetty_version}
|
||||
|
|
@ -271,6 +271,18 @@ Requires: bash
|
|||
Eclipse Plugin Development Environment. This package is required for
|
||||
developing Eclipse plugins.
|
||||
|
||||
%package p2-discovery
|
||||
Summary: Eclipse p2 Discovery
|
||||
Group: Development/Tools
|
||||
Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
|
||||
Obsoletes: %{name}-p2-discovery < 1:4.4.0
|
||||
|
||||
%description p2-discovery
|
||||
The p2 Discovery mechanism provides a simplified and branded front-end for the
|
||||
p2 provisioning platform. Discovery can be used as a tool to display and
|
||||
install from existing P2 repositories or as a framework to build branded
|
||||
installer UIs.
|
||||
|
||||
%package tests
|
||||
Summary: Eclipse Tests
|
||||
Group: Development/Tools
|
||||
|
|
@ -336,7 +348,6 @@ tar --strip-components=1 -xf %{SOURCE1}
|
|||
%pom_disable_module features/org.eclipse.equinox.p2.sdk rt.equinox.p2
|
||||
%pom_disable_module features/org.eclipse.equinox.server.p2 rt.equinox.bundles
|
||||
%pom_disable_module features/org.eclipse.equinox.serverside.sdk rt.equinox.bundles
|
||||
%pom_disable_module bundles/org.eclipse.equinox.p2.tests.discovery rt.equinox.p2
|
||||
%pom_disable_module bundles/org.eclipse.equinox.p2.tests.reconciler.product rt.equinox.p2
|
||||
%pom_disable_module org.eclipse.ua.tests eclipse.platform.ua
|
||||
|
||||
|
|
@ -468,7 +479,6 @@ sed -i '/javax\.servlet/ s/3\.1/3\.2/' rt.equinox.bundles/bundles/org.eclipse.eq
|
|||
sed -i -e 's@Dhelp.lucene.tokenizer=standard@XX:MaxPermSize=384M@g' eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
|
||||
|
||||
%build
|
||||
%{?scl:%scl_maven_opts}
|
||||
#This is the lowest value where the build succeeds. 512m is not enough.
|
||||
export MAVEN_OPTS="-Xmx1000m -XX:MaxPermSize=256m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
|
||||
export JAVA_HOME=%{java_home}
|
||||
|
|
@ -495,7 +505,8 @@ dependencies/fake_ant_dependency.sh \
|
|||
# Initialize them and move into dropins.
|
||||
utils/move_JDT_PDE_to_dropins.sh \
|
||||
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 equinox.p2.discovery.feature sdk"
|
||||
|
||||
pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse
|
||||
|
||||
|
|
@ -691,11 +702,18 @@ rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip
|
|||
rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.bat
|
||||
|
||||
pushd $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/plugins
|
||||
f=`ls | grep org.easymock_`
|
||||
rm $f
|
||||
ln -s /usr/share/java/easymock.jar $f
|
||||
rm -rf org.hamcrest.core_*
|
||||
rm -rf org.junit_*
|
||||
f=`ls | grep -e "^org.easymock_"`
|
||||
rm -rf $f
|
||||
ln -s %{_javadir}/easymock.jar ${f%.jar}.jar
|
||||
f=`ls | grep -e "^org.mockito.mockito-core_"`
|
||||
rm -rf $f
|
||||
ln -s %{_javadir}/mockito.jar ${f%.jar}.jar
|
||||
f=`ls | grep -e "^org.objenesis_"`
|
||||
rm -rf $f
|
||||
ln -s %{_javadir}/objenesis/objenesis.jar ${f%.jar}.jar
|
||||
# These are already present in the platform
|
||||
rm -rf org.hamcrest.core_*
|
||||
rm -rf org.junit_*
|
||||
popd
|
||||
|
||||
sed -i -e "s#@libdir@#%{_libdir}#" $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.sh
|
||||
|
|
@ -972,13 +990,17 @@ fi
|
|||
%{_libdir}/%{pkg_name}/p2
|
||||
|
||||
%files jdt
|
||||
%attr(0755,root,root) %{_bindir}/efj
|
||||
%{_bindir}/efj
|
||||
%{_libdir}/%{pkg_name}/dropins/jdt
|
||||
|
||||
%files pde
|
||||
%{_bindir}/%{pkg_name}-pdebuild
|
||||
%{_libdir}/%{pkg_name}/buildscripts
|
||||
%{_libdir}/%{pkg_name}/dropins/sdk
|
||||
%{_libdir}/%{pkg_name}/dropins/cvs
|
||||
|
||||
%files p2-discovery
|
||||
%{_libdir}/%{pkg_name}/dropins/equinox.p2.discovery.feature
|
||||
|
||||
%files tests
|
||||
%{_bindir}/%{pkg_name}-runEclipsePackageTests
|
||||
|
|
@ -993,6 +1015,12 @@ fi
|
|||
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
|
||||
|
||||
%changelog
|
||||
* Wed Jul 02 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-4
|
||||
- Package the equinox.p2.discovery feature, obsolete the separate package
|
||||
- Update e-b snapshot
|
||||
- BR/R: gogo-command >= 0.14
|
||||
- Symlink mockito to system jar in testing package
|
||||
|
||||
* Fri Jun 27 2014 Roland Grunberg <rgrunber@redhat.com> - 1:4.4.0-3
|
||||
- Fix sed delimeter when dealing with paths.
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1,2 +1,2 @@
|
|||
d1e37d9af6848edbdd54d5988c77fa58 R4_platform-aggregator-R4_4.tar.xz
|
||||
4b0e52cd5be2ce73b6f41d90993bc366 org.eclipse.linuxtools.eclipse-build-93cece6ca02e022b0d8d0816a9f6596b311ab774.tar.bz2
|
||||
7c474d620e8cad433ea871b4b6239d3e org.eclipse.linuxtools.eclipse-build-b95311b1c90288893e23fdd8d13373aba80a8e6b.tar.bz2
|
||||
|
|
|
|||
Loading…
Reference in New Issue