rpms
/
eclipse
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rebuild for new ECF

This commit is contained in:
Mat Booth 2015-08-26 11:26:27 +01:00
parent 703d5b3def
commit 89893fbd4d
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
eclipse.spec
View File

@ -37,7 +37,7 @@ Epoch: 1
Summary: An open, extensible IDE Summary: An open, extensible IDE
Name: eclipse Name: eclipse
Version: %{eclipse_version} Version: %{eclipse_version}
Release: 13%{?dist} Release: 14%{?dist}
License: EPL License: EPL
URL: http://www.eclipse.org/ URL: http://www.eclipse.org/
@ -182,7 +182,7 @@ BuildRequires: atinject-tck >= 1-18
BuildRequires: tycho >= 0.22.0-15 BuildRequires: tycho >= 0.22.0-15
BuildRequires: tycho-extras >= 0.22 BuildRequires: tycho-extras >= 0.22
BuildRequires: cbi-plugins BuildRequires: cbi-plugins
BuildRequires: eclipse-ecf-core >= 3.10.0-5 BuildRequires: eclipse-ecf-core >= 3.10.1-1
BuildRequires: eclipse-emf-core >= 2.11.0-2 BuildRequires: eclipse-emf-core >= 2.11.0-2
BuildRequires: eclipse-license BuildRequires: eclipse-license
BuildRequires: glassfish-jsp-api >= 2.2.1-4 BuildRequires: glassfish-jsp-api >= 2.2.1-4
@ -265,7 +265,7 @@ Requires: sac >= 1.3-12
Requires: batik-css >= 1.8-0.17 Requires: batik-css >= 1.8-0.17
Requires: xml-commons-apis >= 1.4.01-12 Requires: xml-commons-apis >= 1.4.01-12
Requires: atinject >= 1-18 Requires: atinject >= 1-18
Requires: eclipse-ecf-core >= 3.10.0-5 Requires: eclipse-ecf-core >= 3.10.1-1
Requires: eclipse-emf-core >= 2.11.0-2 Requires: eclipse-emf-core >= 2.11.0-2
Requires: glassfish-jsp-api >= 2.2.1-4 Requires: glassfish-jsp-api >= 2.2.1-4
Requires: glassfish-jsp >= 2.2.5 Requires: glassfish-jsp >= 2.2.5
@ -708,28 +708,28 @@ rsync -vrpl eclipse.platform.releng.tychoeclipsebuilder/platform/target/products
#eclipse compiler #eclipse compiler
install -m 755 jdtcompilatorscript/efj.sh $RPM_BUILD_ROOT%{_bindir}/efj install -m 755 jdtcompilatorscript/efj.sh $RPM_BUILD_ROOT%{_bindir}/efj
TARGET_LAUNCHER=%{_libdir}/%{pkg_name}/plugins/`ls eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse/plugins | grep launcher_[0-9]*` TARGET_LAUNCHER=%{_libdir}/eclipse/plugins/`ls eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse/plugins | grep launcher_[0-9]*`
sed -i -e "s,@LAUNCHER@,${TARGET_LAUNCHER}," $RPM_BUILD_ROOT%{_bindir}/efj sed -i -e "s,@LAUNCHER@,${TARGET_LAUNCHER}," $RPM_BUILD_ROOT%{_bindir}/efj
# Symlink eclipse binary # Symlink eclipse binary
pushd $RPM_BUILD_ROOT%{_bindir} pushd $RPM_BUILD_ROOT%{_bindir}
ln -s %{_libdir}/%{pkg_name}/eclipse ln -s %{_libdir}/eclipse/eclipse
popd popd
# SWT is a directory, but we need to provide jars for others that depend on it # SWT is a directory, but we need to provide jars for others that depend on it
pushd $RPM_BUILD_ROOT/%{_libdir}/%{pkg_name}/plugins pushd $RPM_BUILD_ROOT/%{_libdir}/eclipse/plugins
SWT_JAR=$(ls | grep swt.gtk.linux) SWT_JAR=$(ls | grep swt.gtk.linux)
(cd ${SWT_JAR} && zip -r "../../swt.jar" * ) (cd ${SWT_JAR} && zip -r "../../swt.jar" * )
popd popd
# Symlink SWT jar # Symlink SWT jar
pushd $RPM_BUILD_ROOT/%{_jnidir}/ pushd $RPM_BUILD_ROOT/%{_jnidir}/
ln -s $(abs2rel %{_libdir}/%{pkg_name}/swt.jar %{_jnidir}) ln -s $(abs2rel %{_libdir}/eclipse/swt.jar %{_jnidir})
popd popd
# Symlink eclipse ini # Symlink eclipse ini
pushd $RPM_BUILD_ROOT/%{_sysconfdir}/ pushd $RPM_BUILD_ROOT/%{_sysconfdir}/
ln -s %{_libdir}/%{pkg_name}/eclipse.ini ln -s %{_libdir}/eclipse/eclipse.ini
popd popd
# List jars to be symlinked into javadir # List jars to be symlinked into javadir
@ -840,15 +840,15 @@ pushd $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/testbundle
# Set the proper paths for scripts # Set the proper paths for scripts
sed -i 's|\.\+/\(gatherBundles\.sh\)|%{_javadir}/eclipse-testing/testbundle/\1|' prepRuntimeLocation.sh sed -i 's|\.\+/\(gatherBundles\.sh\)|%{_javadir}/eclipse-testing/testbundle/\1|' prepRuntimeLocation.sh
sed -i 's|\.\+/\(genRepo\.sh\)|%{_javadir}/eclipse-testing/testbundle/\1|' prepAllTestBundles.sh sed -i 's|\.\+/\(genRepo\.sh\)|%{_javadir}/eclipse-testing/testbundle/\1|' prepAllTestBundles.sh
sed -i 's|\.\+/\(prepRuntimeLocation\.sh\)|%{_javadir}/eclipse-testing/testbundle/\1|' %{pkg_name}-runTestBundles sed -i 's|\.\+/\(prepRuntimeLocation\.sh\)|%{_javadir}/eclipse-testing/testbundle/\1|' eclipse-runTestBundles
sed -i 's|\.\+/\(prepAllTestBundles\.sh\)|%{_javadir}/eclipse-testing/testbundle/\1|' %{pkg_name}-runTestBundles sed -i 's|\.\+/\(prepAllTestBundles\.sh\)|%{_javadir}/eclipse-testing/testbundle/\1|' eclipse-runTestBundles
sed -i 's|cp swtbot-library.xml alltest.xml updateTestBundleXML.sh target/|cp %{_javadir}/eclipse-testing/testbundle/{swtbot-library.xml,alltest.xml,updateTestBundleXML.sh} target/|' prepRuntimeLocation.sh sed -i 's|cp swtbot-library.xml alltest.xml updateTestBundleXML.sh target/|cp %{_javadir}/eclipse-testing/testbundle/{swtbot-library.xml,alltest.xml,updateTestBundleXML.sh} target/|' prepRuntimeLocation.sh
for file in genRepo.sh gatherBundles.sh ;do for file in genRepo.sh gatherBundles.sh ;do
sed -i 's|scl_root=|scl_root=%{?_scl_root}|' ${file} sed -i 's|scl_root=|scl_root=%{?_scl_root}|' ${file}
done done
mv $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/testbundle/%{pkg_name}-runTestBundles $RPM_BUILD_ROOT/%{_bindir}/%{pkg_name}-runTestBundles mv $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/testbundle/eclipse-runTestBundles $RPM_BUILD_ROOT/%{_bindir}/eclipse-runTestBundles
popd popd
#fix so permissions #fix so permissions
@ -1103,6 +1103,9 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
%changelog %changelog
* Wed Aug 26 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-14
- Rebuild for new ECF
* Thu Aug 20 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-13 * Thu Aug 20 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-13
- Add patch for rhbz#1255150 - Add patch for rhbz#1255150
- Always use UTC timestamps to prevent rpmdiff failures - Always use UTC timestamps to prevent rpmdiff failures