11:14 a.m.
commit b0df04aeb2800e15479f7e9f6ca2ce3eaab92cc2
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Wed Feb 4 13:18:06 2015 -0500
Place all test bundles under %{_javadir} instead of dropins.
- Fix packaging of Eclipse OProfile wrapper script.
eclipse-linuxtools.spec | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
---
diff --git a/eclipse-linuxtools.spec b/eclipse-linuxtools.spec
index 9174607..12b91b2 100644
--- a/eclipse-linuxtools.spec
+++ b/eclipse-linuxtools.spec
@@ -6,7 +6,7 @@
Name: %{?scl_prefix}eclipse-linuxtools
Version: 3.1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Linux specific Eclipse plugins
License: EPL
@@ -151,7 +151,7 @@ sed -i '/<target>/,/<\/target>/ d' pom.xml
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
-%mvn_package ":*.{test,tests}" linuxtools-tests
+%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
@@ -187,7 +187,7 @@ done
pushd oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts
rm -f *.sh
echo '#!/bin/sh' > opcontrol
-echo 'exec pkexec /usr/bin/opcontrol ${1+"$@"}' >> opcontrol
+echo 'exec pkexec %{_bindir}/opcontrol ${1+"$@"}' >> opcontrol
popd
%build
@@ -201,12 +201,38 @@ export
MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/E
install -d -m 755 %{buildroot}%{_datadir}/polkit-1/actions
install -D -m 644
oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/org.eclipse.linuxtools.oprofile.policy
\
%{buildroot}%{_datadir}/polkit-1/actions/org.eclipse.linuxtools.oprofile.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
+# 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
+ grep -q '<packaging>eclipse-test-plugin</packaging>' ${pom}
+ if [ $? -eq 0 ]; then
+ testjar=`ls ${pom/pom.xml/}'target/'*.jar | grep -v sources`
+ 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*
+
+# '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
+
+
%files -f .mfiles-core
%files -n %{?scl_prefix}eclipse-changelog -f .mfiles-changelog
@@ -222,7 +248,6 @@ done
%files -n %{?scl_prefix}eclipse-gprof -f .mfiles-gprof
%files -n %{?scl_prefix}eclipse-oprofile -f .mfiles-oprofile
-%attr(755, root, root)
%{eclipse_dropin}/linuxtools-oprofile/eclipse/plugins/org.eclipse.linuxtools.oprofile.core_*/natives/linux/scripts/opcontrol
%{_datadir}/polkit-1/actions/org.eclipse.linuxtools.oprofile.policy
%files -n %{?scl_prefix}eclipse-perf -f .mfiles-perf
@@ -231,9 +256,14 @@ done
%files -n %{?scl_prefix}eclipse-systemtap -f .mfiles-systemtap
-%files -n %{?scl_prefix}eclipse-linuxtools-tests -f .mfiles-linuxtools-tests
+%files -n %{?scl_prefix}eclipse-linuxtools-tests
+%{_javadir}/linuxtools-tests/
%changelog
+* Mon Feb 09 2015 Roland Grunberg <rgrunber(a)redhat.com> - 3.1.0-6
+- Place all test bundles under %%{_javadir} instead of dropins.
+- Fix packaging of Eclipse OProfile wrapper script.
+
* Fri Feb 6 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.0-5
- Rebuild to generate missing OSGi auto-requires