[eclipse-linuxtools] Place all test bundles under %{_javadir} instead of dropins.
by Roland Grunberg
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
9 years, 2 months
[eclipse-swtbot] Rebuild to generate missing OSGi auto-requires
by Mikolaj Izdebski
commit 44bf7a4b1567c0249f91f8dee80f353b73752510
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Feb 6 21:55:15 2015 +0100
Rebuild to generate missing OSGi auto-requires
This rebuild adds missing OSGi auto-requires which were not generated
due to a bug in Fedora P2 integration, fixed in tycho 0.22.0-11.
This rebuild adds the following requires to eclipse-swtbot:
osgi(org.eclipse.jdt.junit)
osgi(org.eclipse.jdt.junit.core)
osgi(org.eclipse.jdt.junit.runtime)
osgi(org.eclipse.jdt.launching)
osgi(org.eclipse.jdt.ui)
osgi(org.eclipse.pde.core)
osgi(org.eclipse.pde.launching)
osgi(org.eclipse.pde.ui)
eclipse-swtbot.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-swtbot.spec b/eclipse-swtbot.spec
index 571729d..10f4299 100644
--- a/eclipse-swtbot.spec
+++ b/eclipse-swtbot.spec
@@ -1,6 +1,6 @@
Name: eclipse-swtbot
Version: 2.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: UI and functional testing tool for SWT and Eclipse based applications
License: EPL
@@ -52,6 +52,9 @@ done
%files -f .mfiles
%changelog
+* Fri Feb 6 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.2.1-4
+- Rebuild to generate missing OSGi auto-requires
+
* Wed Dec 3 2014 Alexander Kurtakov <akurtako(a)redhat.com> 2.2.1-3
- Build with xmvn.
9 years, 2 months
[eclipse-remote] Rebuild to generate missing OSGi auto-requires
by Mikolaj Izdebski
commit 7d1b81f8572eb8cd24336c9b95bb5f0db148d853
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Feb 6 21:55:15 2015 +0100
Rebuild to generate missing OSGi auto-requires
This rebuild adds missing OSGi auto-requires which were not generated
due to a bug in Fedora P2 integration, fixed in tycho 0.22.0-11.
This rebuild adds the following requires to eclipse-remote:
osgi(org.eclipse.ui.trace)
eclipse-remote.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-remote.spec b/eclipse-remote.spec
index 11e6931..c71c346 100644
--- a/eclipse-remote.spec
+++ b/eclipse-remote.spec
@@ -4,7 +4,7 @@
Name: eclipse-remote
Version: 1.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Eclipse Remote Services plug-in
License: EPL
URL: https://www.eclipse.org/ptp/
@@ -41,6 +41,9 @@ find -name *.class -exec rm -rf {} \;
%doc features/org.eclipse.remote-feature/epl-v10.html
%changelog
+* Fri Feb 6 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.1.0-2
+- Rebuild to generate missing OSGi auto-requires
+
* Tue Sep 30 2014 Mat Booth <mat.booth(a)redhat.com> - 1.1.0-1
- Update to 1.1.0
9 years, 2 months
[eclipse-mpc] Rebuild to generate missing OSGi auto-requires
by Mikolaj Izdebski
commit 5fcc95949d725ce8252106dd2d63f368032704a0
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Feb 6 21:55:15 2015 +0100
Rebuild to generate missing OSGi auto-requires
This rebuild adds missing OSGi auto-requires which were not generated
due to a bug in Fedora P2 integration, fixed in tycho 0.22.0-11.
This rebuild adds the following requires to eclipse-mpc:
osgi(org.eclipse.equinox.p2.discovery)
osgi(org.eclipse.equinox.p2.ui.discovery)
eclipse-mpc.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-mpc.spec b/eclipse-mpc.spec
index d7f79b6..dd5a325 100644
--- a/eclipse-mpc.spec
+++ b/eclipse-mpc.spec
@@ -2,7 +2,7 @@
Name: eclipse-mpc
Version: 1.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Eclipse Marketplace Client
Group: Development/Tools
@@ -54,6 +54,9 @@ sed -i '/Bundle-SymbolicName/ s/$/;singleton:=true/' org.eclipse.epp.mpc.core/ME
%files -f .mfiles
%changelog
+* Fri Feb 6 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.3.1-5
+- Rebuild to generate missing OSGi auto-requires
+
* Tue Jan 20 2015 Mat Booth <mat.booth(a)redhat.com> - 1.3.1-4
- Make direct hamcrest use explicit in manifest
9 years, 2 months
[eclipse-gef] Rebuild to generate missing OSGi auto-requires
by Mikolaj Izdebski
commit 2d16b252a8b058cea45c622813044fa4f1662809
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Feb 6 21:55:15 2015 +0100
Rebuild to generate missing OSGi auto-requires
This rebuild adds missing OSGi auto-requires which were not generated
due to a bug in Fedora P2 integration, fixed in tycho 0.22.0-11.
This rebuild adds the following requires to eclipse-gef-sdk:
osgi(org.eclipse.jdt)
osgi(org.eclipse.jdt.core)
osgi(org.eclipse.jdt.ui)
osgi(org.eclipse.pde)
osgi(org.eclipse.pde.ui)
osgi(org.eclipse.platform.doc.isv)
eclipse-gef.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-gef.spec b/eclipse-gef.spec
index 07d1b64..d86a471 100644
--- a/eclipse-gef.spec
+++ b/eclipse-gef.spec
@@ -6,7 +6,7 @@
Name: eclipse-gef
Version: 3.9.101
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Graphical Editing Framework (GEF) Eclipse plug-in
Group: System Environment/Libraries
License: EPL
@@ -82,6 +82,9 @@ find -name *.class -exec rm -rf {} \;
%doc org.eclipse.gef.examples-feature/epl-v10.html
%changelog
+* Fri Feb 6 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.9.101-3
+- Rebuild to generate missing OSGi auto-requires
+
* Wed Jan 14 2015 Mat Booth <mat.booth(a)redhat.com> - 3.9.101-2
- Migrate to mvn_build/mvn_install
9 years, 2 months
[eclipse-eclemma] Rebuild to generate missing OSGi auto-requires
by Mikolaj Izdebski
commit f83d6de757632f39cfe53574028beda4da512a97
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Feb 6 21:55:15 2015 +0100
Rebuild to generate missing OSGi auto-requires
This rebuild adds missing OSGi auto-requires which were not generated
due to a bug in Fedora P2 integration, fixed in tycho 0.22.0-11.
This rebuild adds the following requires to eclipse-eclemma:
osgi(org.eclipse.jdt.core)
osgi(org.eclipse.jdt.launching)
osgi(org.eclipse.jdt.ui)
eclipse-eclemma.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-eclemma.spec b/eclipse-eclemma.spec
index a8f0c51..1f3f46a 100644
--- a/eclipse-eclemma.spec
+++ b/eclipse-eclemma.spec
@@ -1,6 +1,6 @@
Name: eclipse-eclemma
Version: 2.3.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Java code coverage tool plugin for Eclipse
Group: Development/Tools
License: EPL and ASL 2.0
@@ -58,6 +58,9 @@ sed -i /jacoco/s/0.7.3/0.8.0/ `find -name *.MF`
%doc com.mountainminds.eclemma.core/about.html
%changelog
+* Fri Feb 6 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.3.2-4
+- Rebuild to generate missing OSGi auto-requires
+
* Fri Jan 23 2015 Mat Booth <mat.booth(a)redhat.com> - 2.3.2-3
- Patch to explicitly depend on hamcrest core in tests
- Fix files listed twice warning
9 years, 2 months
[eclipse-linuxtools] Rebuild to generate missing OSGi auto-requires
by Mikolaj Izdebski
commit 3f8868b1d1f503f48af0d0df2945a40b59cc0b03
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Feb 6 21:55:15 2015 +0100
Rebuild to generate missing OSGi auto-requires
This rebuild adds missing OSGi auto-requires which were not generated
due to a bug in Fedora P2 integration, fixed in tycho 0.22.0-11.
This rebuild adds the following requires to eclipse-changelog and
eclipse-linuxtools-tests:
osgi(org.eclipse.jdt.core)
osgi(org.eclipse.jdt.ui)
eclipse-linuxtools.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-linuxtools.spec b/eclipse-linuxtools.spec
index 46849d9..9174607 100644
--- a/eclipse-linuxtools.spec
+++ b/eclipse-linuxtools.spec
@@ -6,7 +6,7 @@
Name: %{?scl_prefix}eclipse-linuxtools
Version: 3.1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Linux specific Eclipse plugins
License: EPL
@@ -234,6 +234,9 @@ done
%files -n %{?scl_prefix}eclipse-linuxtools-tests -f .mfiles-linuxtools-tests
%changelog
+* Fri Feb 6 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.0-5
+- Rebuild to generate missing OSGi auto-requires
+
* Tue Jan 20 2015 Mat Booth <mat.booth(a)redhat.com> - 3.1.0-4
- Make direct hamcrest use explicit in manifests
9 years, 2 months
eclipse-mylyn-fedora-integration failure on koschei
by Mikolaj Izdebski
I fixed eclipse-mylyn-fedora-integration FTBFS, which was detected by
Koschei. It was related to dropin directory layout used by some
packages, especially those built from eclipse source package (in this
case it was eclipse-pde).
Some packages uses layout:
eclipse/
dropins/
sdk/
features/
plugins/
instead of expected:
eclipse/
dropins/
sdk/
eclipse/
features/
plugins/
as documented at [0]. Not saying this is incorrect, but I didn't know
about this layout until now.
This is now fixed in fedoraproject-p2 (tycho 0.22.0-11):
https://github.com/rgrunber/fedoraproject-p2/commit/f1bc4c
This bug can manifest in missing or incorrect requires. Since it
potentially affects many packages, I propose to rebuild all eclipse
packages that use %mvn_install. Rebuild should be done before branching
(Tuesday). What do you think?
[0]
http://help.eclipse.org/luna/index.jsp?topic=%2Forg.eclipse.platform.doc....
--
Mikolaj Izdebski
Software Engineer, Red Hat
IRC: mizdebsk
9 years, 2 months
[eclipse-mylyn] Rebuild to fix auto-requires
by Mikolaj Izdebski
commit c8cb4f22906bbfabb2a2df6419270023672d0b6d
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Feb 5 23:43:13 2015 +0100
Rebuild to fix auto-requires
eclipse-mylyn.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index 2fafe51..bb5deda 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -4,7 +4,7 @@
Name: eclipse-mylyn
Summary: Eclipse Mylyn main feature.
Version: 3.14.0
-Release: 2%{?dist}
+Release: 3%{?dist}
License: EPL
URL: http://www.eclipse.org/mylyn
@@ -332,6 +332,9 @@ install %{SOURCE6} \
%files tests -f .mfiles-tests
%changelog
+* Thu Feb 5 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.14.0-3
+- Rebuild to fix auto-requires
+
* Thu Jan 29 2015 Mat Booth <mat.booth(a)redhat.com> - 3.14.0-2
- Build/install with mvn_build/mvn_install, let xmvn auto generate
requires and provides
9 years, 2 months
[tycho] fedoraproject-p2: Fix support for shallow dropin directory layout
by Mikolaj Izdebski
commit a1afbc3d3aea4eabb453352b86f98d085d0d752f
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Feb 5 23:31:37 2015 +0100
fedoraproject-p2: Fix support for shallow dropin directory layout
sources | 2 +-
tycho.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 3adb551..4d3c9d2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-0c7c5bc738676674028f23bd25824966 fedoraproject-p2-d701d8.tar.xz
+aef02359dcd39227b32b1bb7534b69de fedoraproject-p2-f1bc4c.tar.xz
d7ee912e8da240c8d87892ed876960ae org.eclipse.tycho-tycho-0.22.0.tar.bz2
c600a5115f29962c974b75b4b25e74f1 eclipse-bootstrap.tar.xz
diff --git a/tycho.spec b/tycho.spec
index 5855898..447590c 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -17,7 +17,7 @@
# %%global snap -SNAPSHOT
%global snap %{nil}
-%global fp_p2_sha d701d8
+%global fp_p2_sha f1bc4c
%global fp_p2_version 0.0.1
%global fp_p2_snap -SNAPSHOT
@@ -25,7 +25,7 @@
Name: %{?scl_prefix}tycho
Version: 0.22.0
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -427,6 +427,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li
%{_javadocdir}/tycho
%changelog
+* Thu Feb 5 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.22.0-11
+- fedoraproject-p2: Fix support for shallow dropin directory layout
+
* Wed Feb 4 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.22.0-10
- fedoraproject-p2: Bump BREE to JavaSE-1.8
- fedoraproject-p2: Fix installing of virtual bundles provided by p2.inf
9 years, 2 months