diff --git a/eclipse-linuxtools.spec b/eclipse-linuxtools.spec index c51c1b3..126d922 100644 --- a/eclipse-linuxtools.spec +++ b/eclipse-linuxtools.spec @@ -6,7 +6,7 @@ Name: %{?scl_prefix}eclipse-linuxtools Version: 2.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Linux specific Eclipse plugins License: EPL @@ -14,6 +14,7 @@ URL: http://eclipse.org/linuxtools/ Source0: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/snapshot/org.eclipse.linuxtools-%{version}.tar.bz2 Patch1: disable-libhover-lttng.patch Patch2: disable-jacoco-maven-plugin.patch +Patch3: fix-save.patch BuildRequires: tycho BuildRequires: tycho-extras @@ -148,6 +149,7 @@ All test bundles for the Linux Tools project. %patch1 %patch2 +%patch3 %pom_disable_module lttng %pom_disable_module libhover @@ -334,6 +336,9 @@ popd %{_javadir}/linuxtools-tests %changelog +* Tue Oct 8 2013 Krzysztof Daniel 2:2.8.2-3 +- Include fix for save not working in a spec compare editor. + * Mon Sep 30 2013 Alexander Kurtakov 2.1.0-2 - Bump changelog version too. diff --git a/fix-save.patch b/fix-save.patch new file mode 100644 index 0000000..da31114 --- /dev/null +++ b/fix-save.patch @@ -0,0 +1,14 @@ +diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/compare/SpecMergeViewer.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/compare/SpecMergeViewer.java +index 9ca69d5..342e705 100644 +--- rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/compare/SpecMergeViewer.java ++++ rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/compare/SpecMergeViewer.java +@@ -52,6 +52,9 @@ + return new FastPartitioner(new SpecfilePartitionScanner(), + SpecfilePartitionScanner.SPEC_PARTITION_TYPES); + } ++ protected String getDocumentPartitioning() { ++ return SpecfilePartitionScanner.SPEC_FILE_PARTITIONING; ++ } + + @Override + protected void configureTextViewer(TextViewer textViewer) {