diff --git a/eclipse-linuxtools.spec b/eclipse-linuxtools.spec index 0906439..596cae1 100644 --- a/eclipse-linuxtools.spec +++ b/eclipse-linuxtools.spec @@ -1,8 +1,8 @@ -%global git_tag 0ea3da3d4a0c9fedb0dd5e91e955d300e74bc17d +%global git_tag aa54a840151c6b03e22bb9eccb3c8a9de5a1b461 Name: eclipse-linuxtools Version: 7.1.0 -Release: 0.3%{?dist} +Release: 1%{?dist} Summary: Linux specific Eclipse plugins License: EPL-2.0 @@ -30,6 +30,7 @@ BuildRequires: nekohtml BuildRequires: tiger-types BuildRequires: docker-client-java >= 8.11.7-1 BuildRequires: glassfish-jax-rs-api +BuildRequires: glassfish-jaxb-api BuildRequires: assertj-core BuildRequires: mockito # Required because of transitive optional dep from guava @@ -212,7 +213,9 @@ popd # org.assertj -> org.assertj.core # org.mockito -> org.mockito.mockito-core sed -i -e 's/org.assertj/org.assertj.core/' containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF +%if 0%{?fedora} && 0%{?fedora} < 30 sed -i -e 's/org.mockito/org.mockito.mockito-core/' valgrind/org.eclipse.linuxtools.valgrind.core.tests/META-INF/MANIFEST.MF +%endif # Reddeer is not available %pom_disable_module org.eclipse.linuxtools.docker.reddeer containers @@ -229,6 +232,10 @@ sed -i '//,/<\/target>/ d' pom.xml sed -i -e '9i\ javax.annotation-api;bundle-version="1.2.0",' \ containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF +# Fix javax.xml deps +sed -i -e '/javax\.xml\./d' -e '/Import-Package/a\ javax.xml.bind,' -e '/org.eclipse.debug.core/s/,//' \ +containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF + # Relax restriction on guava sed -i -e '/com.google.guava/s/guava\(;bundle-version=\".*\"\)\?/guava;bundle-version=\"[18.0.0,21.0.0)\"/' \ mylyn/org.eclipse.linuxtools.mylyn.osio.rest.{ui,core,core.tests}/META-INF/MANIFEST.MF \ @@ -305,6 +312,9 @@ done %files tests -f .mfiles-linuxtools-tests %changelog +* Mon Dec 10 2018 Mat Booth - 7.1.0-1 +- Update to 2018-12 release + * Wed Sep 12 2018 Mat Booth - 7.1.0-0.3 - Update to latest snapshot diff --git a/sources b/sources index 2b778d6..e08f4ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (org.eclipse.linuxtools-0ea3da3d4a0c9fedb0dd5e91e955d300e74bc17d.tar.xz) = fbd8582a5eb401ba86acf5417f75ebd2d0e9514b5276112e0e8443a76eec48c5b902bcb07aada60273ed3b6ddd0fb66595c4f975e60884714f6abf19925ac46b +SHA512 (org.eclipse.linuxtools-aa54a840151c6b03e22bb9eccb3c8a9de5a1b461.tar.xz) = 385c1bb2f30f8fb85ee9b0aa504a05334e346b2caede1f0ffaf39d87886130878df1e9c50112d9ce6ed9970e7c3a8e9889399725f47ff4806eaf5603194f664c