From 8c7fe4a0a020624ff5c58ba6435f365f8bda9bae Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Aug 21 2015 07:56:56 +0000 Subject: Update to upstream 4.3.0. Simplify BR/R to adapt new names and remove autogenerated ones now. --- diff --git a/.gitignore b/.gitignore index 622d81b..0a97f60 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /pydev_4_0_0.tar.gz /pydev_4_1_0.tar.gz /pydev_4_2_0.tar.gz +/pydev_4_3_0.tar.gz diff --git a/eclipse-pydev.spec b/eclipse-pydev.spec index 6ab56de..6fa489d 100644 --- a/eclipse-pydev.spec +++ b/eclipse-pydev.spec @@ -1,13 +1,13 @@ # Turn off the brp-python-bytecompile script %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') -%global release_version 4_2_0 +%global release_version 4_3_0 Epoch: 1 Summary: Eclipse Python development plug-in Name: eclipse-pydev -Version: 4.2.0 -Release: 3%{?dist} +Version: 4.3.0 +Release: 1%{?dist} License: EPL URL: http://pydev.org @@ -23,9 +23,6 @@ Patch2: system-jython-interpreter.patch # Fix native name Patch3: native-name.patch -# Fix index api breakeage -Patch4: indexapi.patch - Requires: eclipse-platform Requires: python Requires: apache-commons-logging @@ -41,8 +38,7 @@ Requires: python-ipython-console BuildRequires: tycho >= 0.22.0-15 BuildRequires: tycho-extras BuildRequires: eclipse-p2-discovery -BuildRequires: eclipse-mylyn-context-team >= 3.5.0 -BuildRequires: eclipse-mylyn-ide >= 3.5.0 +BuildRequires: eclipse-mylyn >= 3.16.0 BuildRequires: apache-commons-logging BuildRequires: snakeyaml BuildRequires: ws-commons-util @@ -50,7 +46,7 @@ BuildRequires: xmlrpc-common BuildRequires: xmlrpc-client BuildRequires: xmlrpc-server BuildRequires: jython >= 2.7 -BuildRequires: lucene-core +BuildRequires: lucene BuildRequires: lucene-analysis %description @@ -59,8 +55,6 @@ Python development. %package mylyn Summary: Pydev Mylyn Focused UI -Requires: eclipse-mylyn-context-team >= 3.5.0 -Requires: eclipse-mylyn-ide >= 3.5.0 Requires: %{name} = %{epoch}:%{version}-%{release} %description mylyn @@ -72,7 +66,6 @@ Mylyn Task-Focused UI extensions for Pydev. %patch1 -p1 %patch2 -p1 %patch3 -%patch4 -p1 %mvn_package "::pom:" __noinstall %mvn_package ":*.mylyn" mylyn @@ -129,10 +122,10 @@ ln -sf %{_javadir}/snakeyaml.jar \ plugins/org.python.pydev.shared_core/libs/snakeyaml-1.11.jar ln -sf %{_javadir}/lucene/lucene-core.jar \ - plugins/org.python.pydev.shared_core/libs/lucene-core-5.1.0.jar + plugins/org.python.pydev.shared_core/libs/lucene-core-5.2.1.jar ln -sf %{_javadir}/lucene/lucene-analyzers-common.jar \ - plugins/org.python.pydev.shared_core/libs/lucene-analyzers-common-5.1.0.jar + plugins/org.python.pydev.shared_core/libs/lucene-analyzers-common-5.2.1.jar # Fix encodings iconv -f CP1252 -t UTF-8 LICENSE.txt > LICENSE.txt.utf @@ -182,11 +175,11 @@ file=`find . -name snakeyaml-1.11.jar` rm $file ln -sf %{_javadir}/snakeyaml.jar $file -file=`find . -name lucene-core-5.1.0.jar` +file=`find . -name lucene-core-5.2.1.jar` rm $file ln -sf %{_javadir}/lucene/lucene-core.jar $file -file=`find . -name lucene-analyzers-common-5.1.0.jar` +file=`find . -name lucene-analyzers-common-5.2.1.jar` rm $file ln -sf %{_javadir}/lucene/lucene-analyzers-common.jar $file @@ -215,6 +208,10 @@ fi %doc LICENSE.txt %changelog +* Fri Aug 21 2015 akurtakov 1:4.3.0-1 +- Update to upstream 4.3.0. +- Simplify BR/R to adapt new names and remove autogenerated ones now. + * Wed Aug 12 2015 Mat Booth - 1:4.2.0-3 - Add all necessary symlinks for jython diff --git a/indexapi.patch b/indexapi.patch deleted file mode 100644 index 182cad9..0000000 --- a/indexapi.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/plugins/org.python.pydev.shared_core/src/org/python/pydev/shared_core/index/IndexApi.java b/plugins/org.python.pydev.shared_core/src/org/python/pydev/shared_core/index/IndexApi.java -index 85cc7b6..a207714 100644 ---- a/plugins/org.python.pydev.shared_core/src/org/python/pydev/shared_core/index/IndexApi.java -+++ b/plugins/org.python.pydev.shared_core/src/org/python/pydev/shared_core/index/IndexApi.java -@@ -394,7 +394,7 @@ - boolean applyAllDeletes = true; - try (IndexReader reader = DirectoryReader.open(writer, applyAllDeletes);) { - -- IndexSearcher searcher = searcherFactory.newSearcher(reader); -+ IndexSearcher searcher = searcherFactory.newSearcher(reader, null); - Query query = new MatchAllDocsQuery(); - TopDocs docs = searcher.search(query, Integer.MAX_VALUE); - ScoreDoc[] scoreDocs = docs.scoreDocs; -@@ -417,7 +417,7 @@ - Log.log(e); - } - try (IndexReader reader = DirectoryReader.open(writer, applyAllDeletes);) { -- IndexSearcher searcher = searcherFactory.newSearcher(reader); -+ IndexSearcher searcher = searcherFactory.newSearcher(reader, null); - - TopDocs search = searcher.search(query, maxMatches); - ScoreDoc[] scoreDocs = search.scoreDocs; - diff --git a/sources b/sources index 690a6da..a8e46ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -34f108f925eb4bade80a0986ee4fad4b pydev_4_2_0.tar.gz +2a499af39cc79a58cccc3f032b417c75 pydev_4_3_0.tar.gz