diff --git a/.eclipse-ecf.metadata b/.eclipse-ecf.metadata index f7fbd09..043d3db 100644 --- a/.eclipse-ecf.metadata +++ b/.eclipse-ecf.metadata @@ -1 +1 @@ -7d791e3947b359ce6c4c02e9e897cd9bfe2fd0fd SOURCES/org.eclipse.ecf-4923fdc9a5aa667dc3f3f33efb1566120b46e1f6.tar.xz +bdb985e9fb681f71c145a0574b5a55e36fb5fd16 SOURCES/org.eclipse.ecf-10bfc24f030d889e7dfa36e3a77034ae2786c368.tar.xz diff --git a/.gitignore b/.gitignore index 372023d..e5b72ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/org.eclipse.ecf-4923fdc9a5aa667dc3f3f33efb1566120b46e1f6.tar.xz +SOURCES/org.eclipse.ecf-10bfc24f030d889e7dfa36e3a77034ae2786c368.tar.xz diff --git a/SPECS/eclipse-ecf.spec b/SPECS/eclipse-ecf.spec index 66e4c0c..9ebbbbd 100644 --- a/SPECS/eclipse-ecf.spec +++ b/SPECS/eclipse-ecf.spec @@ -4,15 +4,15 @@ # bootstrapping %global __requires_exclude .*org\.eclipse\.equinox.* -%global git_tag 4923fdc9a5aa667dc3f3f33efb1566120b46e1f6 +%global git_tag 10bfc24f030d889e7dfa36e3a77034ae2786c368 # Set this flag to avoid building everything except for the core bundles # Allows building into a brand new buildroot before Eclipse is even built %bcond_with bootstrap Name: eclipse-ecf -Version: 3.14.5 -Release: 3%{?dist} +Version: 3.14.7 +Release: 1%{?dist} Summary: Eclipse Communication Framework (ECF) Eclipse plug-in # Note: The org.jivesoftware.smack bundle is Apache licensed @@ -43,7 +43,8 @@ BuildRequires: eclipse-pde BuildArch: noarch -ExclusiveArch: x86_64 +# Upstream Eclipse no longer supports non-64bit arches +ExclusiveArch: x86_64 %description ECF is a set of frameworks for building communications into applications and @@ -59,6 +60,7 @@ Requires: httpcomponents-core ECF bundles required by eclipse-platform. %if %{without bootstrap} + %package runtime Summary: Eclipse Communication Framework (ECF) Eclipse plug-in @@ -87,9 +89,6 @@ find . -type f -name "*.class" -exec rm {} \; # Correction for content of runtime package %pom_xpath_remove "feature/plugin[@id='org.eclipse.ecf.presence']" releng/features/org.eclipse.ecf.core/feature.xml -# Fix ASM restriction -sed -i -e '/org.objectweb.asm/s/7/8/' protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF - # Don't build examples or tests sed -i -e '/examples/d' -e '/tests/d' pom.xml %pom_disable_module releng/features/org.eclipse.ecf.tests.feature @@ -238,12 +237,28 @@ popd %{_javadir}/eclipse/* %if %{without bootstrap} + %files runtime -f .mfiles-runtime %files sdk -f .mfiles-sdk %endif %changelog +* Fri Mar 20 2020 Mat Booth - 3.14.7-1 +- Update to latest upstream release + +* Tue Jan 28 2020 Fedora Release Engineering - 3.14.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Dec 19 2019 Mat Booth - 3.14.6-3 +- Full build + +* Wed Dec 18 2019 Mat Booth - 3.14.6-2 +- Enable bootstrap mode + +* Wed Dec 18 2019 Mat Booth - 3.14.6-1 +- Update to latest upstream release + * Mon Jul 01 2019 Mat Booth - 3.14.5-3 - Add BSD to the license tag @@ -495,4 +510,4 @@ popd - Review issues fixed. * Wed Aug 8 2012 Krzysztof Daniel 3.5.6-1 -- Initial packaging. +- Initial packaging. \ No newline at end of file