From 89893fbd4dda9e64d51d99e43fe51c2e39c13fb3 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 26 Aug 2015 11:26:27 +0100 Subject: [PATCH] Rebuild for new ECF --- eclipse.spec | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/eclipse.spec b/eclipse.spec index 561cac2..b349412 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -37,7 +37,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_version} -Release: 13%{?dist} +Release: 14%{?dist} License: EPL URL: http://www.eclipse.org/ @@ -182,7 +182,7 @@ BuildRequires: atinject-tck >= 1-18 BuildRequires: tycho >= 0.22.0-15 BuildRequires: tycho-extras >= 0.22 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-license 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: xml-commons-apis >= 1.4.01-12 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: glassfish-jsp-api >= 2.2.1-4 Requires: glassfish-jsp >= 2.2.5 @@ -708,28 +708,28 @@ rsync -vrpl eclipse.platform.releng.tychoeclipsebuilder/platform/target/products #eclipse compiler 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 # Symlink eclipse binary pushd $RPM_BUILD_ROOT%{_bindir} - ln -s %{_libdir}/%{pkg_name}/eclipse + ln -s %{_libdir}/eclipse/eclipse popd # 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) (cd ${SWT_JAR} && zip -r "../../swt.jar" * ) popd # Symlink SWT jar pushd $RPM_BUILD_ROOT/%{_jnidir}/ - ln -s $(abs2rel %{_libdir}/%{pkg_name}/swt.jar %{_jnidir}) + ln -s $(abs2rel %{_libdir}/eclipse/swt.jar %{_jnidir}) popd # Symlink eclipse ini pushd $RPM_BUILD_ROOT/%{_sysconfdir}/ - ln -s %{_libdir}/%{pkg_name}/eclipse.ini + ln -s %{_libdir}/eclipse/eclipse.ini popd # 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 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|\.\+/\(prepRuntimeLocation\.sh\)|%{_javadir}/eclipse-testing/testbundle/\1|' %{pkg_name}-runTestBundles -sed -i 's|\.\+/\(prepAllTestBundles\.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|' 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 for file in genRepo.sh gatherBundles.sh ;do sed -i 's|scl_root=|scl_root=%{?_scl_root}|' ${file} 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 #fix so permissions @@ -1103,6 +1103,9 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_* %changelog +* Wed Aug 26 2015 Mat Booth - 1:4.5.0-14 +- Rebuild for new ECF + * Thu Aug 20 2015 Mat Booth - 1:4.5.0-13 - Add patch for rhbz#1255150 - Always use UTC timestamps to prevent rpmdiff failures