diff --git a/.devtoolset-3-eclipse-linuxtools.metadata b/.devtoolset-3-eclipse-linuxtools.metadata
index 8cf6d2b..4a999a6 100644
--- a/.devtoolset-3-eclipse-linuxtools.metadata
+++ b/.devtoolset-3-eclipse-linuxtools.metadata
@@ -1 +1 @@
-13b5591575ae38a75006018dcc9ce78365e69616 SOURCES/org.eclipse.linuxtools-3.1.0b.tar.bz2
+e009a35ab998f6e986d6396404db4b23e6616904 SOURCES/org.eclipse.linuxtools-3.2.0.tar.bz2
diff --git a/.gitignore b/.gitignore
index 9568408..4c68fee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/org.eclipse.linuxtools-3.1.0b.tar.bz2
+SOURCES/org.eclipse.linuxtools-3.2.0.tar.bz2
diff --git a/SOURCES/disable-libhover-lttng.patch b/SOURCES/disable-libhover-lttng.patch
index 4875f65..977bc55 100644
--- a/SOURCES/disable-libhover-lttng.patch
+++ b/SOURCES/disable-libhover-lttng.patch
@@ -1,128 +1,122 @@
-diff -up ./releng/org.eclipse.linuxtools.releng-site/category.xml.fix ./releng/org.eclipse.linuxtools.releng-site/category.xml
---- ./releng/org.eclipse.linuxtools.releng-site/category.xml.fix 2014-09-19 15:10:06.829195893 -0400
-+++ ./releng/org.eclipse.linuxtools.releng-site/category.xml 2014-09-19 15:10:11.452260425 -0400
-@@ -4,6 +4,7 @@
+diff --git releng/org.eclipse.linuxtools.releng-site/category.xml releng/org.eclipse.linuxtools.releng-site/category.xml
+index 6235b53..dfeb7c0 100644
+--- releng/org.eclipse.linuxtools.releng-site/category.xml
++++ releng/org.eclipse.linuxtools.releng-site/category.xml
+@@ -4,18 +4,6 @@
Nightly builds of Linux Tools project.
-+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
-@@ -55,6 +57,7 @@
+@@ -55,18 +43,6 @@
-+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
-@@ -82,9 +86,11 @@
+@@ -82,37 +58,13 @@
-+
+-
+-
+-
-
+-
+-
+-
+
-@@ -95,6 +101,7 @@
+
-+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
-@@ -119,9 +127,11 @@
+@@ -122,9 +74,6 @@
-+
+-
+-
+-
-@@ -149,6 +159,7 @@
+@@ -152,15 +101,6 @@
-+
-
-
-
-@@ -179,30 +191,36 @@
+@@ -182,15 +122,6 @@
-+
+-
+-
+-
+-
+-
+-
+-
+-
+-
Eclipse Linux Tools
-
-
-+
-
-
- Eclipse Linux Tools source features and bundles
-
-
-+
-
diff --git a/SOURCES/oprofile-fix-tool-detection.patch b/SOURCES/oprofile-fix-tool-detection.patch
new file mode 100644
index 0000000..fed4118
--- /dev/null
+++ b/SOURCES/oprofile-fix-tool-detection.patch
@@ -0,0 +1,21 @@
+diff --git oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/OprofileSetupTab.java oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/OprofileSetupTab.java
+index c4bd918..9534371 100644
+--- oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/OprofileSetupTab.java
++++ oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/OprofileSetupTab.java
+@@ -12,6 +12,7 @@
+ package org.eclipse.linuxtools.internal.oprofile.launch.configuration;
+
+ import java.text.MessageFormat;
++import java.util.ArrayList;
+ import java.util.Arrays;
+ import java.util.List;
+
+@@ -161,7 +162,7 @@ public class OprofileSetupTab extends AbstractLaunchConfigurationTab {
+ l2.setLayoutData(data);
+
+ controlCombo = new CCombo(p, SWT.DROP_DOWN|SWT.READ_ONLY|SWT.BORDER);
+- List tools = Arrays.asList(OprofileProject.OPERF_BINARY);
++ List tools = new ArrayList<>(Arrays.asList(OprofileProject.OPERF_BINARY));
+ try {
+ Process proc = RuntimeProcessFactory.getFactory().exec(
+ new String [] {"which", OprofileProject.OPCONTROL_BINARY }, //$NON-NLS-1$
diff --git a/SOURCES/remove-target.patch b/SOURCES/remove-target.patch
index 9ab57b6..63bab1d 100644
--- a/SOURCES/remove-target.patch
+++ b/SOURCES/remove-target.patch
@@ -2,10 +2,10 @@ diff -up ./pom.xml.fix ./pom.xml
--- ./pom.xml.fix 2014-09-19 15:27:02.592366937 -0400
+++ ./pom.xml 2014-09-19 15:27:19.252599177 -0400
@@ -52,7 +52,6 @@
- update-3.1
- 0.21.0
- 0.21.0
-- linuxtools-staging
+ update-3.2
+ 0.22.0
+ 0.22.0
+- linuxtools-e4.4
jacoco
reuseReports
${project.basedir}/../../target/jacoco.exec
diff --git a/SPECS/eclipse-linuxtools.spec b/SPECS/eclipse-linuxtools.spec
index a5fcfcf..b4f3a5f 100644
--- a/SPECS/eclipse-linuxtools.spec
+++ b/SPECS/eclipse-linuxtools.spec
@@ -1,38 +1,35 @@
%{?scl:%scl_package eclipse-linuxtools}
%{!?scl:%global pkg_name %{name}}
-%{!?maven_scl:%global maven_scl_prefix %{nil}}
+%{?java_common_find_provides_and_requires}
%global eclipse_dropin %{_datadir}/eclipse/dropins
-%global linuxtools_tag 3.1.0b
+%global git_tag 3.2.0
Name: %{?scl_prefix}eclipse-linuxtools
-Version: 3.1.0
-Release: 0.1.git20140917%{?dist}
+Version: 3.2.0
+Release: 2%{?dist}
Summary: Linux specific Eclipse plugins
License: EPL
URL: http://eclipse.org/linuxtools/
-Source0: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/snapshot/org.eclipse.linuxtools-%{linuxtools_tag}.tar.bz2
+Source0: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/snapshot/org.eclipse.linuxtools-%{git_tag}.tar.bz2
Patch0: disable-libhover-lttng.patch
Patch1: disable-ptp.patch
Patch2: disable-rdt.patch
Patch4: add-base-rhel-tools-path.patch
Patch5: remove-target.patch
+Patch6: oprofile-fix-tool-detection.patch
-BuildRequires: tycho >= 0.20.0
-BuildRequires: tycho-extras
+BuildRequires: %{?scl_prefix}tycho >= 0.21.0
+BuildRequires: %{?scl_prefix}tycho-extras
BuildRequires: %{?scl_prefix}eclipse-cdt
BuildRequires: %{?scl_prefix}eclipse-jdt
-BuildRequires: %{?scl_prefix}swt-chart
+BuildRequires: %{?scl_prefix}swt-chart >= 0.9.0
BuildRequires: %{?scl_prefix}eclipse-remote
BuildRequires: %{?scl_prefix}eclipse-license
-BuildRequires: %{maven_scl_prefix}maven-clean-plugin
BuildRequires: %{?scl_prefix}eclipse-swtbot
BuildRequires: %{?scl_prefix}eclipse-gef
-BuildRequires: %{?scl_prefix}eclipse-remote
-BuildRequires: %{maven_scl_prefix}exec-maven-plugin
-
-Requires: %{?scl_prefix}swt-chart
+BuildRequires: %{?scl_prefix_maven}exec-maven-plugin
BuildArch: noarch
Obsoletes: %{?scl_prefix}eclipse-linuxprofilingframework < 2.0.0
@@ -136,103 +133,102 @@ Requires: %{?scl_prefix}eclipse-oprofile
Requires: %{?scl_prefix}eclipse-perf
Requires: %{?scl_prefix}eclipse-valgrind
Requires: %{?scl_prefix}eclipse-systemtap
-Requires: %{?scl_prefix}eclipse-swtbot
-Requires: %{?scl_prefix}eclipse-linuxtools
-Requires: %{?scl_prefix}eclipse-cdt
%description -n %{?scl_prefix}eclipse-linuxtools-tests
All test bundles for the Linux Tools project.
%prep
-%setup -q -n org.eclipse.linuxtools-%{linuxtools_tag}
+%setup -q -n org.eclipse.linuxtools-%{git_tag}
%patch0
%patch1
%patch2 -p1
%patch4
%patch5
+%patch6
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
%pom_remove_plugin org.jacoco:jacoco-maven-plugin
%pom_disable_module lttng
%pom_disable_module libhover
-# Do not package swt-chart
-sed -i '/org.swtchart/,/<\/iu>/ d' releng/org.eclipse.linuxtools.releng-site/category.xml
+# Don't use target platform
+%pom_disable_module releng
+sed -i '//,/<\/target>/ d' pom.xml
#remove tests that fail to compile
rm -fr profiling/org.eclipse.linuxtools.profiling.tests/src/org/eclipse/linuxtools/profiling/tests/AbstractRemoteTest.java
rm -fr perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/LaunchRemoteTest.java
-%build
-export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
-scl enable %{scl} - <<"EOF"
-xmvn -o clean verify -Dmaven.test.skip=true -DskipTychoVersionCheck=true
-EOF
-
-pushd releng/org.eclipse.linuxtools.releng-site/target/repository/features
-for f in `ls -1 . | grep jar$`; do
- unzip $f -d ${f/.jar//};
- rm -fr $f
+%mvn_package ":*.{test,tests}" __noinstall
+%mvn_package "org.eclipse.linuxtools{,.profiling}:" core
+%mvn_package "org.eclipse.linuxtools.changelog:" changelog
+%mvn_package "org.eclipse.linuxtools.gcov:" gcov
+%mvn_package "org.eclipse.linuxtools.gprof:" gprof
+%mvn_package "org.eclipse.linuxtools.man:" manpage
+%mvn_package "org.eclipse.linuxtools.oprofile:" oprofile
+%mvn_package "org.eclipse.linuxtools.perf{,-parent}:" perf
+%mvn_package "org.eclipse.linuxtools.rpm:" rpm-editor
+%mvn_package "org.eclipse.linuxtools.systemtap:" systemtap
+%mvn_package "org.eclipse.linuxtools.valgrind:" valgrind
+
+# Fix test fragment localizations
+# TODO fix upstream
+for b in gcov/org.eclipse.linuxtools.gcov.test \
+ gprof/org.eclipse.linuxtools.gprof.test \
+ oprofile/org.eclipse.linuxtools.oprofile.core.tests \
+ oprofile/org.eclipse.linuxtools.oprofile.launch.tests \
+ oprofile/org.eclipse.linuxtools.oprofile.ui.tests \
+ rpm/org.eclipse.linuxtools.rpm.ui.editor.tests \
+ systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests \
+ systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests \
+ valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests \
+ valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests \
+ valgrind/org.eclipse.linuxtools.valgrind.massif.tests \
+ valgrind/org.eclipse.linuxtools.valgrind.ui.tests ; do
+ sed -i "/^Bundle-Localization/d" $b/META-INF/MANIFEST.MF
+ sed -i "s|plugin.properties|OSGI-INF/|" $b/build.properties
+ mkdir -p $b/OSGI-INF/l10n
+ mv $b/plugin.properties $b/OSGI-INF/l10n/bundle.properties
done
+
+# Create opcontrol wrapper
+pushd oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts
+rm -f *.sh
+echo '#!/bin/sh' > opcontrol
+echo 'exec pkexec %{_bindir}/opcontrol ${1+"$@"}' >> opcontrol
popd
+%{?scl:EOF}
+
+%build
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
+export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
+%mvn_build -j -f
+%{?scl:EOF}
+
%install
-install -d -m 755 %{buildroot}%{eclipse_dropin}
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
+%mvn_install
+%{?scl:EOF}
-for s in changelog rpmstubby perf valgrind oprofile man rpm gcov gprof systemtap linuxtools; do
-mkdir -p %{buildroot}%{eclipse_dropin}/$s/{plugins,features}
+# Install opcontrol wrapper polkit permissions policy
+install -d -m 755 %{buildroot}%{_root_datadir}/polkit-1/actions
+install -D -m 644 oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/org.eclipse.linuxtools.oprofile.policy \
+ %{buildroot}%{_root_datadir}/polkit-1/actions/org.eclipse.linuxtools.oprofile.policy
+install -D -m 644 oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/org.eclipse.linuxtools.oprofile.policy \
+ %{buildroot}%{_root_datadir}/polkit-1/actions/org.eclipse.linuxtools.oprofile-dts3.policy
+sed -i 's|/usr/bin/opcontrol|%{_bindir}/opcontrol|
+ s|oprofile|oprofile-dts3|' %{buildroot}%{_root_datadir}/polkit-1/actions/org.eclipse.linuxtools.oprofile-dts3.policy
+sed -i '/natives\/linux\/scripts\/opcontrol/ s|644|755|' .mfiles-oprofile
+
+# Appstream addon metadata
+for p in changelog gcov ; do
+ install -m644 -D $p/eclipse-$p.metainfo.xml %{buildroot}%{_datadir}/appdata/eclipse-$p.metainfo.xml
done
+# Tests
mkdir -p %{buildroot}%{_javadir}/linuxtools-tests/plugins
-
-pushd releng/org.eclipse.linuxtools.releng-site/target/repository
-#changelog
-mv ./plugins/*changelog* %{buildroot}%{eclipse_dropin}/changelog/plugins
-mv ./features/*changelog* %{buildroot}%{eclipse_dropin}/changelog/features
-
-#rpm
-mv ./plugins/*rpm* %{buildroot}%{eclipse_dropin}/rpm/plugins
-mv ./features/*rpm* %{buildroot}%{eclipse_dropin}/rpm/features
-
-#man
-mv ./plugins/*man* %{buildroot}%{eclipse_dropin}/man/plugins
-mv ./features/*man* %{buildroot}%{eclipse_dropin}/man/features
-
-#gcov
-mv ./plugins/*gcov* %{buildroot}%{eclipse_dropin}/gcov/plugins
-mv ./features/*gcov* %{buildroot}%{eclipse_dropin}/gcov/features
-
-#gprof
-mv ./plugins/*gprof* %{buildroot}%{eclipse_dropin}/gprof/plugins
-mv ./features/*gprof* %{buildroot}%{eclipse_dropin}/gprof/features
-
-#perf
-mv ./plugins/*perf* %{buildroot}%{eclipse_dropin}/perf/plugins
-mv ./features/*perf* %{buildroot}%{eclipse_dropin}/perf/features
-
-#valgrind
-mv ./plugins/*valgrind* %{buildroot}%{eclipse_dropin}/valgrind/plugins
-mv ./features/*valgrind* %{buildroot}%{eclipse_dropin}/valgrind/features
-
-#oprofile
-mv ./plugins/*oprofile* %{buildroot}%{eclipse_dropin}/oprofile/plugins
-mv ./features/*oprofile* %{buildroot}%{eclipse_dropin}/oprofile/features
-
-#systemtap
-mv ./plugins/*systemtap* %{buildroot}%{eclipse_dropin}/systemtap/plugins
-mv ./features/*systemtap* %{buildroot}%{eclipse_dropin}/systemtap/features
-mv ./plugins/*callgraph* %{buildroot}%{eclipse_dropin}/systemtap/plugins
-mv ./features/*callgraph* %{buildroot}%{eclipse_dropin}/systemtap/features
-
-#linuxtools
-mv ./plugins/* %{buildroot}%{eclipse_dropin}/linuxtools/plugins
-mv ./features/* %{buildroot}%{eclipse_dropin}/linuxtools/features
-# Use system swt-chart
-ln -s %{_javadir}/swt-chart.jar %{buildroot}%{eclipse_dropin}/linuxtools/plugins
-
-popd
-
-#tests
# We need grep to return non-zero status to skip all non eclipse-test-plugins
set +e
for pom in `find . -name pom.xml`; do
@@ -242,189 +238,165 @@ for pom in `find . -name pom.xml`; do
mv ${testjar} %{buildroot}%{_javadir}/linuxtools-tests/plugins
fi
done
+set -e
# Remove .rpm.createrepo.tests
rm -rf %{buildroot}%{_javadir}/linuxtools-tests/plugins/*.rpm.createrepo.tests*
-set -e
+# 'eclipse-plugin' jars that are needed by tests
+for loc in profiling/org.eclipse.linuxtools.profiling.tests \
+ oprofile/org.eclipse.linuxtools.oprofile.tests \
+ valgrind/org.eclipse.linuxtools.valgrind.tests ; do
+ testjar=`ls ${loc}/target/*.jar | grep -v sources`
+ mv ${testjar} %{buildroot}%{_javadir}/linuxtools-tests/plugins
+done
-testjar=`ls profiling/org.eclipse.linuxtools.profiling.tests/target/*.jar | grep -v sources`
-mv ${testjar} %{buildroot}%{_javadir}/linuxtools-tests/plugins
-testjar=`ls oprofile/org.eclipse.linuxtools.oprofile.tests/target/*.jar | grep -v sources`
-mv ${testjar} %{buildroot}%{_javadir}/linuxtools-tests/plugins
-testjar=`ls valgrind/org.eclipse.linuxtools.valgrind.tests/target/*.jar | grep -v sources`
-mv ${testjar} %{buildroot}%{_javadir}/linuxtools-tests/plugins
-
-### oprofile install.sh stuff ###
-pushd %{buildroot}%{eclipse_dropin}/oprofile/plugins
-OPROFILECOREVERSION=$(ls . | grep org.eclipse.linuxtools.oprofile.core_ | sed 's/org.eclipse.linuxtools.oprofile.core_//' |sed 's/.jar//')
-unzip org.eclipse.linuxtools.oprofile.core_$OPROFILECOREVERSION.jar -d ./org.eclipse.linuxtools.oprofile.core_$OPROFILECOREVERSION
-rm -fr org.eclipse.linuxtools.oprofile.core_$OPROFILECOREVERSION.jar
-%global corepath %{buildroot}%{eclipse_dropin}/oprofile/plugins/org.eclipse.linuxtools.oprofile.core_$OPROFILECOREVERSION
-
-#create opcontrol wrapper
-pushd %{corepath}/natives/linux/scripts
-rm -f *.sh
-echo '#!/bin/sh' > opcontrol
-echo 'exec pkexec %{_bindir}/opcontrol ${1+"$@"}' >> opcontrol
-popd
-# create DTS 3.0 OProfile policy file
-pushd org.eclipse.linuxtools.oprofile.core_$OPROFILECOREVERSION/natives/linux/scripts
-cp org.eclipse.linuxtools.oprofile{,-dts3}.policy
-sed -i -e 's|/usr/bin/opcontrol|%{_bindir}/opcontrol|' org.eclipse.linuxtools.oprofile-dts3.policy
-sed -i -e 's|org.eclipse.linuxtools.oprofile.run-opcontrol|org.eclipse.linuxtools.oprofile-dts3.run-opcontrol|' org.eclipse.linuxtools.oprofile-dts3.policy
-popd
+%files -f .mfiles-core
-#install opcontrol wrapper permission files
-install -d -m 755 %{buildroot}%{_root_datadir}/polkit-1/actions
-install -D -m 644 \
- org.eclipse.linuxtools.oprofile.core_$OPROFILECOREVERSION/natives/linux/scripts/org.eclipse.linuxtools.oprofile.policy \
-%{buildroot}%{_root_datadir}/polkit-1/actions/org.eclipse.linuxtools.oprofile.policy
-install -D -m 644 \
- org.eclipse.linuxtools.oprofile.core_$OPROFILECOREVERSION/natives/linux/scripts/org.eclipse.linuxtools.oprofile-dts3.policy \
-%{buildroot}%{_root_datadir}/polkit-1/actions/org.eclipse.linuxtools.oprofile-dts3.policy
+%files -n %{?scl_prefix}eclipse-changelog -f .mfiles-changelog
+%{_datadir}/appdata/eclipse-changelog.metainfo.xml
-#remove installed files
-rm -f org.eclipse.linuxtools.oprofile.core_$OPROFILECOREVERSION/natives/linux/scripts/org.eclipse.linuxtools.oprofile{,-dts3}.policy
+%files -n %{?scl_prefix}eclipse-rpm-editor -f .mfiles-rpm-editor
-popd
+%files -n %{?scl_prefix}eclipse-manpage -f .mfiles-manpage
+%files -n %{?scl_prefix}eclipse-gcov -f .mfiles-gcov
+%{_datadir}/appdata/eclipse-gcov.metainfo.xml
-%files
-%{eclipse_dropin}/linuxtools
+%files -n %{?scl_prefix}eclipse-gprof -f .mfiles-gprof
-%files -n %{?scl_prefix}eclipse-changelog
-%{eclipse_dropin}/changelog
+%files -n %{?scl_prefix}eclipse-oprofile -f .mfiles-oprofile
+%{_root_datadir}/polkit-1/actions/org.eclipse.linuxtools.oprofile.policy
+%{_root_datadir}/polkit-1/actions/org.eclipse.linuxtools.oprofile-dts3.policy
-%files -n %{?scl_prefix}eclipse-rpm-editor
-%{eclipse_dropin}/rpm
+%files -n %{?scl_prefix}eclipse-perf -f .mfiles-perf
-%files -n %{?scl_prefix}eclipse-manpage
-%{eclipse_dropin}/man
+%files -n %{?scl_prefix}eclipse-valgrind -f .mfiles-valgrind
-%files -n %{?scl_prefix}eclipse-gcov
-%{eclipse_dropin}/gcov
+%files -n %{?scl_prefix}eclipse-systemtap -f .mfiles-systemtap
-%files -n %{?scl_prefix}eclipse-gprof
-%{eclipse_dropin}/gprof
+%files -n %{?scl_prefix}eclipse-linuxtools-tests
+%{_javadir}/linuxtools-tests/
-%files -n %{?scl_prefix}eclipse-oprofile
-%{eclipse_dropin}/oprofile
-%attr(755, root, root) %{eclipse_dropin}/oprofile/plugins/org.eclipse.linuxtools.oprofile.core_*/natives/linux/scripts/opcontrol
-%{_root_datadir}/polkit-1/actions/org.eclipse.linuxtools.oprofile.policy
-%{_root_datadir}/polkit-1/actions/org.eclipse.linuxtools.oprofile-dts3.policy
+%changelog
+* Mon Mar 23 2015 Roland Grunberg - 3.2.0-2
+- Fix tool detection.
+- Resolves: rhbz#1204098.
-%files -n %{?scl_prefix}eclipse-perf
-%{eclipse_dropin}/perf
+* Thu Feb 26 2015 Roland Grunberg - 3.2.0-1
+- Update to 3.2 upstream release.
+- Resolves: rhbz#1175106.
-%files -n %{?scl_prefix}eclipse-valgrind
-%{eclipse_dropin}/valgrind
+* Thu Feb 05 2015 Roland Grunberg - 3.1.0-3.4
+- Fix packaging of Eclipse OProfile policy files and wrapper script.
+- Resolves: rhbz#1189091.
-%files -n %{?scl_prefix}eclipse-systemtap
-%{eclipse_dropin}/systemtap
+* Wed Feb 04 2015 Roland Grunberg - 3.1.0-3.3
+- Place all test bundles under %%{_javadir} instead of dropins.
+- Resolves rhbz#1188637.
-%files -n %{?scl_prefix}eclipse-linuxtools-tests
-%{_javadir}/linuxtools-tests
+* Thu Jan 22 2015 Mat Booth - 3.1.0-3.2
+- Related: rhbz#1183966 - Regenerate requires on java-common SCL
-%changelog
-* Fri Sep 19 2014 Roland Grunberg - 3.1.0-0.1.git20140917
-- Update Linux Tools to 3.1.0 RC4.
+* Thu Jan 15 2015 Mat Booth - 3.1.0-3.1
+- Import into DTS 3.1
-* Fri Sep 19 2014 Roland Grunberg - 3.0.0-5
-- Disable XDG_DATA_DIRS when Base RHEL Tools enabled.
-- Resolves: rhbz#1134011
+* Thu Sep 25 2014 Mat Booth - 3.1.0-3
+- Build/install with mvn_build/mvn_install
-* Mon Aug 18 2014 Jeff Johnston - 3.0.0-4.7
-- Fix systemtap chart to use similar fix made previously for piecharts
-- Resolves rhbz#1112608
+* Thu Sep 25 2014 Mat Booth - 3.1.0-2
+- Install supplied appstream metadata
-* Tue Aug 12 2014 Roland Grunberg - 3.0.0-4.6
-- Eclipse OProfile should use opcontrol from DTS 3.0.
+* Wed Sep 24 2014 Mat Booth - 3.1.0-1
+- Update to latest upstream release
-* Mon Aug 11 2014 Jeff Johnston - 3.0.0-4.5
-- Fix missing tool path messages reported in rhbz#1127619.
+* Wed Sep 03 2014 Mat Booth - 3.1.0-0.2.git802e91dd
+- Update to git snapshot of 3.1
-* Mon Aug 11 2014 Roland Grunberg - 3.0.0-4.4
-- Fix additional issues reported against rhbz#1116387.
-- Fix bug in GCov plugin's annotation model.
+* Tue Sep 02 2014 Mat Booth - 3.1.0-0.1.git7c21d231
+- Update to git snapshot of 3.1
+- Drop upstreamed patches
-* Wed Aug 06 2014 Jeff Johnston 3.0.0-4.3
-- Add additional fixes to pie chart code to save and restore fonts
-- Needed for rhbz#1112608
+* Tue Aug 12 2014 Jeff Johnston 3.0.0-6
+- Fix messages in tools path properties page.
+- Fix commented out pie-chart patch.
-* Thu Jul 24 2014 Sami Wagiaalla 3.0.0-4.2
-- Add missing requirements to tests package.
+* Wed Aug 06 2014 Jeff Johnston 3.0.0-5
+- Modify piechart patch to prevent premature disposal of fonts.
-* Tue Jul 22 2014 Roland Grunberg - 3.0.0-4.1
-- Fail gracefully when no events exist.
+* Thu Jul 24 2014 Jeff Johnston 3.0.0-4
+- Fix piechart title centering for swt-chart 0.9 and higher.
-* Mon Jul 21 2014 Roland Grunberg - 3.0.0-4
-- Fix timer-mode failure.
-- Fix location of polkit policy file.
-- Resolves: rhbz#1116387.
+* Thu Jul 24 2014 Sami Wagiaalla 3.0.0-3
+- Disable createrepo tests.
-* Wed Jul 09 2014 Jeff Johnston 3.0.0-3
-- Add fix for rhbz#1112608
+* Mon Jun 30 2014 Alexander Kurtakov 3.0.0-2
+- Backport patch for disappearing RPM menu.
-* Mon Jun 30 2014 Alexander Kurtakov 3.0.0-2.1
-- Update to final 3.0 with path for rhbz#1112694.
+* Tue Jun 24 2014 Alexander Kurtakov 3.0.0-1
+- Update to 3.0 final release.
-* Fri Jun 6 2014 Sami Wagiaalla 3.0.0-0.3.git20140509
-- Add a 'Requires' on eclipse-swtbot to linuxtools-tests.
-- Do not package createrepo tests.
+* Sat Jun 07 2014 Fedora Release Engineering - 3.0.0-0.3.git20140509
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-* Thu May 29 2014 Roland Grunberg - 3.0.0-0.2.git20140509
-- Add manual R: to %%{?scl_prefix}swt-chart.
+* Tue May 13 2014 Alexander Kurtakov 3.0.0-0.2.git20140509
+- BR latest tycho to not manually copy eclipse-license.
-* Thu May 22 2014 Jeff Johnston 3.0.0-0.1.git20140509
-- Update to Linux Tools 3.0 from Luna M7
+* Fri May 9 2014 Alexander Kurtakov 3.0.0-0.1.git20140509
+- First Luna build.
-* Thu Dec 12 2013 Alexander Kurtakov 2.2.0-2
-- Bump release to rebuild.
+* Thu Mar 20 2014 Mat Booth - 2.2.1-1
+- Update to Linux Tools 2.2.1 release.
+- Drop dep on usermode, we use polkit now.
-* Thu Dec 12 2013 Alexander Kurtakov 2.2.0-1
-- Update to Linux Tools 2.2.0.
+* Sun Dec 29 2013 Alexander Kurtakov 2.2.0-3
+- Bump release for rebuild.
-* Mon Dec 02 2013 Jeff Johnston 2.1.0-4
-- Fix systemtap to recognize Linux Tools path for local execution
-- Resolves rhbz#1027331
+* Sun Dec 29 2013 Alexander Kurtakov 2.2.0-2
+- Drop old Provides and make Obsoletes fully cover old versions.
-* Tue Nov 19 2013 Jeff Johnston 2.1.0-3
-- Add a base RHEL tools path using tools.launch.core
-- Resolves #1027331
+* Wed Dec 11 2013 Alexander Kurtakov 2.2.0-1
+- Update to Linux Tools 2.2.0 tag.
-* Mon Oct 14 2013 Alexander Kurtakov 2.1.0-2
-- Require swt-chart.
+* Mon Nov 18 2013 Alexander Kurtakov 2.2.0-0.1.gitd2973ee
+- Update to Linux Tools 2.2.0 snapshot.
-* Mon Oct 7 2013 Roland Grunberg 2.1.0-1
-- Update to 2.1.0.
+* Tue Oct 8 2013 Krzysztof Daniel 2.1.0-3
+- Include fix for save not working in a spec compare editor.
-* Thu Jun 27 2013 Alexander Kurtakov 2.0.0-1
-- Final 2.0.0 release.
+* Mon Sep 30 2013 Alexander Kurtakov 2.1.0-2
+- Bump changelog version too.
-* Fri Jun 07 2013 Sami Wagiaalla 2.0.0-0.9.git6428ae8
-- Update to RC3.
+* Mon Sep 30 2013 Alexander Kurtakov 2.1.0-1
+- Update to latest upstream release.
-* Thu Jun 06 2013 Roland Grunberg 2.0.0-0.8.git7648994
-- Add information on how to use DTS 2.0 OProfile.
+* Thu Sep 19 2013 Roland Grunberg - 2.0.0-4
+- Fix Bug 1009448.
-* Thu May 09 2013 Roland Grunberg 2.0.0-0.7.git7648994
-- Remove unnecessary installation scripts.
-- Resolves #911014.
+* Tue Aug 13 2013 Roland Grunberg - 2.0.0-3
+- Add eclipse-linuxtools-tests subpackage.
-* Thu May 09 2013 Sami Wagiaalla 2.0.0-0.7.git7648994
-- Update to a new snapshot.
-- Disable test modules which depend on ptp.
+* Tue Aug 06 2013 Roland Grunberg - 2.0.0-2
+- Fix Bug 992171.
-* Tue Apr 23 2013 Roland Grunberg 2.0.0-0.6.gitd67d6da
-- Create another OProfile policy file to be used for DTS 2.0.
+* Sat Aug 03 2013 Fedora Release Engineering - 2.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-* Mon Apr 22 2013 Sami Wagiaalla 2.0.0-0.5.gitd67d6da
-- Update to a new snapshot containing fix for bz 948724.
+* Thu Jun 27 2013 Alexander Kurtakov 2:2.0.0-1
+- Final 2.0.0 release.
-* Mon Apr 22 2013 Roland Grunberg 2.0.0-0.4.gita645f32
-- Use OProfile from SCL root.
+* Fri Jun 07 2013 Sami Wagiaalla 2:2.0.0-0.7.git6428ae8
+- Update to RC3.
+
+* Mon May 13 2013 Roland Grunberg 2:2.0.0-0.6.git294c1bf
+- Update to a newer snapshot.
+
+* Mon May 13 2013 Alexander Kurtakov 2:2.0.0-0.5.gitd67d6da
+- Make callgraph and linuxtoolsframework obsoletes be fixed.
+
+* Tue Apr 23 2013 Sami Wagiaalla 2.0.0-0.4.gitd67d6da
+- Update to a new snapshot.
* Thu Apr 11 2013 Alexander Kurtakov 2.0.0-0.3.gita645f32
- New snapshot containing fix for building with Ant 1.9.
@@ -437,15 +409,17 @@ popd
- Update to 2.0.0 prerelease for Kepler compatibility.
- Changelog no longer has it's own release as the version bumped.
-* Wed Feb 13 2013 Roland Grunberg 1.2.0-3
-- Build as noarch.
+* Mon Feb 4 2013 1.2.0-5
+- Actually remove 'Requires: kernel-debuginfo' from systemtap.
+
+* Wed Jan 30 2013 1.2.0-4
+- Remove 'Requires: kernel-debuginfo' from systemtap.
-* Thu Jan 24 2013 Roland Grunberg 1.2.0-3
+* Thu Jan 24 2013 1.2.0-3
- Properly package PolicyKit for Eclipse OProfile.
-* Fri Dec 7 2012 Roland Grunberg 1.2.0-2
-- Make changes to build in SCL environment.
-- Disable bundles that depend on Eclipse PTP, and SWTBot.
+* Mon Jan 7 2013 1.2.0-2
+- Add 'Requires' to systemtap on kernel-debuginfo.
* Fri Nov 23 2012 Roland Grunberg 1.2.0-1
- Update to 1.2.0 upstream release.