From 4c47d08d5a76559e07301f30bf72c5c90869eeef Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Feb 03 2016 20:22:44 +0000 Subject: Fix symlinks for new lucene - Use %global instead of %define and other macro improvements --- diff --git a/eclipse-lucene-4.patch b/eclipse-lucene-4.patch index 21a24fa..45f945f 100644 --- a/eclipse-lucene-4.patch +++ b/eclipse-lucene-4.patch @@ -483,7 +483,7 @@ diff --git a/dependencies/replace_platform_plugins_with_symlinks.sh b/dependenci index b818924..f1a67b3 100755 --- a/dependencies/replace_platform_plugins_with_symlinks.sh +++ b/dependencies/replace_platform_plugins_with_symlinks.sh -@@ -45,15 +45,7 @@ pushd $1 +@@ -45,12 +45,7 @@ pushd $1 _symlink org.apache.felix.gogo.shell_ felix-gogo-shell/org.apache.felix.gogo.shell.jar _symlink javax.annotation-api_ glassfish-annotation-api.jar _symlink org.apache.lucene.core_ lucene/lucene-core.jar @@ -492,10 +492,7 @@ index b818924..f1a67b3 100755 - _symlink org.apache.lucene.queries lucene/lucene-queries.jar - _symlink org.apache.lucene.queryparser lucene/lucene-queryparser.jar - _symlink org.apache.lucene.sandbox lucene/lucene-sandbox.jar -- _symlink org.apache.xalan xalan-j2.jar -- _symlink org.apache.xerces xerces-j2.jar -- _symlink org.apache.xml.resolver xml-commons-resolver.jar -- _symlink org.apache.xml.serializer xalan-j2-serializer.jar +- _symlink org.apache.regexp_ regexp.jar + _symlink org.apache.lucene.analysis_ lucene/lucene-analyzers-common.jar _symlink org.eclipse.jetty.util_ jetty/jetty-util.jar _symlink org.eclipse.jetty.server_ jetty/jetty-server.jar diff --git a/eclipse.spec b/eclipse.spec index aec0ea4..0cb25c2 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -11,13 +11,13 @@ Epoch: 1 %global eclipse_major 4 %global eclipse_minor 5 %global eclipse_micro 1 -%global eb_commit f53a7bd2aedc58f1226833639b07e6dc7faf0470 +%global eb_commit 60b198a9d667c8f038d72c8fb49e628bd30fb714 %global eclipse_tag R4_5_1 %global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro} %if 0%{?fedora} >= 24 %global _jetty_version 9.3.4 -%global _lucene_version 5.3.1 +%global _lucene_version 5.4.1 %else %if 0%{?fedora} >= 23 %global _jetty_version 9.3.0 @@ -29,27 +29,27 @@ Epoch: 1 %endif %ifarch %{ix86} - %define eclipse_arch x86 + %global eclipse_arch x86 %endif %ifarch %{arm} - %define eclipse_arch arm + %global eclipse_arch arm %endif %ifarch ppc64 ppc64p7 - %define eclipse_arch ppc64 + %global eclipse_arch ppc64 %endif %ifarch s390 s390x ppc x86_64 aarch64 ppc64le - %define eclipse_arch %{_arch} + %global eclipse_arch %{_arch} %endif # See fedora-devel-java-list discussion in September 2008. # # Prevent brp-java-repack-jars from being run. -%define __jar_repack %{nil} +%global __jar_repack %{nil} Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_version} -Release: 9%{?dist} +Release: 10%{?dist} License: EPL URL: http://www.eclipse.org/ @@ -123,12 +123,12 @@ Patch19: %{pkg_name}-support-symlink-bundles.patch Patch20: %{pkg_name}-feature-plugins-to-category-ius.patch Patch21: disable-non-linux.patch -%if 0%{?fedora} >= 23 -# Port to Lucene 5 -Patch22: eclipse-lucene-5.patch -%else +%if 0%{?fedora} == 22 # Port to Lucene 4 Patch22: eclipse-lucene-4.patch +%else +# Port to Lucene 5 +Patch22: eclipse-lucene-5.patch %endif Patch23: %{pkg_name}-javaxannotation-import.patch @@ -571,6 +571,11 @@ for f in `find eclipse.platform.team/bundles/org.eclipse.core.net/fragments -nam echo -e "Eclipse-BundleShape: dir\n\n" >> $f; done +%if 0%{?rhel} < 7 +# No GTK3 on EL 6 +sed -i '/machine_gtk3/d' eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.%{eclipse_arch}/pom.xml +%endif + #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 @@ -637,6 +642,11 @@ utils/move_JDT_PDE_to_dropins.sh \ `pwd`/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository \ "jdt cvs sdk" +# Fix symlinks for lucene 5.3 on F23 +%if 0%{?fedora} == 23 +sed -i -e '/regexp/d' dependencies/replace_platform_plugins_with_symlinks.sh +%endif + # 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} @@ -668,14 +678,10 @@ sed -i "s|-Xmx512m|-Xmx1024m|g" eclipse.ini sed -i '1i-protect\nmaster' eclipse.ini # Use GTK3 by default on Fedora or RHEL 7 and newer -%if 0%{?fedora} -sed -i '5i--launcher.GTK_version\n3' eclipse.ini +%if 0%{?rhel} == 6 +sed -i '5i--launcher.GTK_version\n2' eclipse.ini %else -%if 0%{?rhel} >= 7 sed -i '5i--launcher.GTK_version\n3' eclipse.ini -%else -sed -i '5i--launcher.GTK_version\n2' eclipse.ini -%endif %endif # Temporary fix until https://bugs.eclipse.org/294877 is resolved @@ -938,27 +944,9 @@ fi %{_libdir}/%{pkg_name}/plugins/javax.xml_* %{_libdir}/%{pkg_name}/plugins/com.sun.el.javax.el_* %{_libdir}/%{pkg_name}/plugins/javax.inject_*.jar -%{_libdir}/%{pkg_name}/plugins/org.apache.ant_* -%{_libdir}/%{pkg_name}/plugins/org.apache.batik.css_* -%{_libdir}/%{pkg_name}/plugins/org.apache.batik.util.gui_* -%{_libdir}/%{pkg_name}/plugins/org.apache.batik.util_* -%{_libdir}/%{pkg_name}/plugins/org.apache.httpcomponents.httpclient_* -%{_libdir}/%{pkg_name}/plugins/org.apache.httpcomponents.httpcore_* -%{_libdir}/%{pkg_name}/plugins/org.apache.commons.codec_* -%{_libdir}/%{pkg_name}/plugins/org.apache.commons.jxpath_* -%{_libdir}/%{pkg_name}/plugins/org.apache.commons.logging_* -%{_libdir}/%{pkg_name}/plugins/org.apache.felix.gogo.command_* -%{_libdir}/%{pkg_name}/plugins/org.apache.felix.gogo.runtime_* -%{_libdir}/%{pkg_name}/plugins/org.apache.felix.gogo.shell_* +%{_libdir}/%{pkg_name}/plugins/org.apache.* %{_libdir}/%{pkg_name}/plugins/javax.annotation-api_* %{_libdir}/%{pkg_name}/plugins/org.glassfish.web.javax.servlet.jsp_* -%{_libdir}/%{pkg_name}/plugins/org.apache.lucene.* -%if 0%{?fedora} >= 23 -%{_libdir}/%{pkg_name}/plugins/org.apache.xalan_* -%{_libdir}/%{pkg_name}/plugins/org.apache.xerces_* -%{_libdir}/%{pkg_name}/plugins/org.apache.xml.resolver_* -%{_libdir}/%{pkg_name}/plugins/org.apache.xml.serializer_* -%endif %{_libdir}/%{pkg_name}/plugins/org.eclipse.ant.core_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.compare_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.compare.core_* @@ -1144,6 +1132,10 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_* %changelog +* Wed Feb 03 2016 Mat Booth - 1:4.5.1-10 +- Fix symlinks for new lucene +- Use %%global instead of %%define and other macro improvements + * Wed Feb 03 2016 Fedora Release Engineering - 1:4.5.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 33e6c51..965a1aa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ e5d41fe15276fc027f0c5877be0abfbd R4_platform-aggregator-R4_5_1.tar.xz -2858c18b10628c8c76be18ff60351de0 org.eclipse.linuxtools.eclipse-build-f53a7bd2aedc58f1226833639b07e6dc7faf0470.tar.xz +7734705e9d6be9de1308ba16e1675601 org.eclipse.linuxtools.eclipse-build-60b198a9d667c8f038d72c8fb49e628bd30fb714.tar.xz