[eclipse-linuxtools] Delete failing test and drop rpmstubby - merged in rpm-editor.
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri May 9 20:32:37 UTC 2014
commit 13b4de95430998bcd2ee934e2ad3e7291a9bcdd6
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Fri May 9 23:32:59 2014 +0300
Delete failing test and drop rpmstubby - merged in rpm-editor.
eclipse-linuxtools.spec | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/eclipse-linuxtools.spec b/eclipse-linuxtools.spec
index 5141246..d8c38a2 100644
--- a/eclipse-linuxtools.spec
+++ b/eclipse-linuxtools.spec
@@ -49,18 +49,13 @@ useful for ChangeLog maintenance within the Eclipse IDE. It includes
fragments for parsing C, C++, and Java source files to create more detailed
entries containing function or method names.
-%package -n %{?scl_prefix}eclipse-rpmstubby
-
-Summary: Rpm spec file generator
-
-%description -n %{?scl_prefix}eclipse-rpmstubby
-RPM Stubby Plug-in is a plugin aiming to auto-generate RPM spec files.
-
%package -n %{?scl_prefix}eclipse-rpm-editor
Summary: RPM Spec file editor for Eclipse
Requires: rpmlint >= 0.81
Requires: rpmdevtools
+Obsoletes: %{?scl_prefix}eclipse-rpmstubby < 3.0.0
+Provides: %{?scl_prefix}eclipse-rpmstubby = %{version}-%{release}
%description -n %{?scl_prefix}eclipse-rpm-editor
The Eclipse Spec file Editor package contains Eclipse plugins that are
@@ -153,6 +148,11 @@ sed -i '/org.swtchart/,/<\/iu>/ d' releng/org.eclipse.linuxtools.releng-site/cat
mkdir -p .m2/p2/repo-sdk/features/
cp -r %{_javadir}/eclipse-license/eclipse/features/* .m2/p2/repo-sdk/features/
+#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
+sed -i -e "s|, LaunchRemoteTest.class||g" perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/AllPerfTests.java
+
%build
%{?scl:%scl_maven_opts}
export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
@@ -178,9 +178,6 @@ 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
-#rpmstubby
-mv ./plugins/*rpmstubby* %{buildroot}%{eclipse_dropin}/rpmstubby/plugins
-mv ./features/*rpmstubby* %{buildroot}%{eclipse_dropin}/rpmstubby/features
#rpm
mv ./plugins/*rpm* %{buildroot}%{eclipse_dropin}/rpm/plugins
@@ -279,9 +276,6 @@ popd
%files -n %{?scl_prefix}eclipse-changelog
%{eclipse_dropin}/changelog
-%files -n %{?scl_prefix}eclipse-rpmstubby
-%{eclipse_dropin}/rpmstubby
-
%files -n %{?scl_prefix}eclipse-rpm-editor
%{eclipse_dropin}/rpm
More information about the scm-commits
mailing list