From 6843c008c39b906be06a4970817a906f05b7bd02 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mar 10 2016 09:58:09 +0000 Subject: Drop unnecessary obsoletes - Additional requires for tests --- diff --git a/eclipse-linuxtools.spec b/eclipse-linuxtools.spec index 15a96bf..655b85a 100644 --- a/eclipse-linuxtools.spec +++ b/eclipse-linuxtools.spec @@ -1,6 +1,6 @@ Name: eclipse-linuxtools Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Linux specific Eclipse plugins License: EPL @@ -28,7 +28,6 @@ BuildRequires: glassfish-jax-rs-api BuildRequires: assertj-core BuildArch: noarch -Obsoletes: eclipse-linuxprofilingframework < 2.0.0 %description The Linux Tools project is a two-faceted project. Firstly, it develops tools @@ -128,8 +127,6 @@ projects using the Valgrind tool suite and presents the results in the IDE. Summary: Systemtap Tools Integration for Eclipse Requires: systemtap -Obsoletes: eclipse-callgraph < 2.0.0 -Obsoletes: eclipse-systemtapgui < 2.0.0 %description -n eclipse-systemtap Integrate Systemtap's profiling and tracing capabilities with the CDT. @@ -161,6 +158,10 @@ Requires: eclipse-oprofile Requires: eclipse-perf Requires: eclipse-valgrind Requires: eclipse-systemtap +Requires: eclipse-linuxtools-javadocs +Requires: eclipse-ptp +Requires: eclipse-swtbot +Requires: eclipse-tests %description tests All test bundles for the Linux Tools project. @@ -184,7 +185,7 @@ sed -i -e 's/org.assertj/org.assertj.core/' containers/org.eclipse.linuxtools.do # Don't use target platform %pom_disable_module releng -%pom_disable_module org.eclipse.linuxtools.changelog.ui.tests changelog +%pom_disable_module org.eclipse.linuxtools.changelog.ui.tests changelog %pom_disable_module org.eclipse.linuxtools.docker.ui.tests containers sed -i '//,/<\/target>/ d' pom.xml @@ -210,6 +211,7 @@ for f in `find containers/org.eclipse.linuxtools.docker.core -name "*.java"`; do ' $f done +%mvn_package "::pom::" __noinstall %mvn_package ":*.{test,tests}" linuxtools-tests %mvn_package ":*.tests.hamcrest-wrap" linuxtools-tests %mvn_package ":org.eclipse.linuxtools.docker*" docker @@ -299,6 +301,10 @@ install -D -m 755 eclipse-runLinuxToolsTestBundles %{buildroot}%{_bindir}/eclips %{_bindir}/eclipse-runLinuxToolsTestBundles %changelog +* Thu Mar 10 2016 Mat Booth - 4.2.1-2 +- Drop unnecessary obsoletes +- Additional requires for tests + * Mon Feb 29 2016 Alexander Kurtakov 4.2.1-1 - Update to 4.2.1 final release.