Compare commits

..

No commits in common. "c8" and "5560e03e0df61e0907cf1da24fa4d8ac66ea09f1" have entirely different histories.

7 changed files with 39 additions and 12 deletions

View File

@ -1 +1 @@
7d791e3947b359ce6c4c02e9e897cd9bfe2fd0fd SOURCES/org.eclipse.ecf-4923fdc9a5aa667dc3f3f33efb1566120b46e1f6.tar.xz
531f765f2af4e8f04b98714f53d7323b562eb89f org.eclipse.ecf-1e6e8e72cbb77a0e359e409cd4d2a58d03a6428d.tar.xz

3
.gitignore vendored
View File

@ -1 +1,2 @@
SOURCES/org.eclipse.ecf-4923fdc9a5aa667dc3f3f33efb1566120b46e1f6.tar.xz
SOURCES/org.eclipse.ecf-1e6e8e72cbb77a0e359e409cd4d2a58d03a6428d.tar.xz
/org.eclipse.ecf-1e6e8e72cbb77a0e359e409cd4d2a58d03a6428d.tar.xz

1
dead.package.c9s Normal file
View File

@ -0,0 +1 @@
eclipse-ecf package is retired for CS-806

View File

@ -4,20 +4,20 @@
# bootstrapping
%global __requires_exclude .*org\.eclipse\.equinox.*
%global git_tag 4923fdc9a5aa667dc3f3f33efb1566120b46e1f6
%global git_tag 1e6e8e72cbb77a0e359e409cd4d2a58d03a6428d
# 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.8
Release: 1%{?dist}
Summary: Eclipse Communication Framework (ECF) Eclipse plug-in
# Note: The org.jivesoftware.smack bundle is Apache licensed
# Note: The ch.ethz.iks.r_osgi.remote bundle is BSD licensed
License: EPL-1.0 and ASL 2.0 and BSD
License: EPL-2.0 and ASL 2.0 and BSD
URL: https://www.eclipse.org/ecf/
Source0: https://git.eclipse.org/c/ecf/org.eclipse.ecf.git/snapshot/org.eclipse.ecf-%{git_tag}.tar.xz
@ -30,7 +30,7 @@ Patch1: 0002-Remove-unneeded-dep-on-jdt-annotations.patch
BuildRequires: tycho
BuildRequires: tycho-extras
BuildRequires: maven-plugin-build-helper
BuildRequires: eclipse-license
BuildRequires: eclipse-license2
BuildRequires: osgi-annotation
BuildRequires: httpcomponents-client
BuildRequires: httpcomponents-core
@ -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,12 +89,10 @@ 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 '/<module>examples/d' -e '/<module>tests/d' pom.xml
%pom_disable_module releng/features/org.eclipse.ecf.tests.feature
%pom_disable_module releng/features/org.eclipse.ecf.tests.filetransfer.feature
%pom_disable_module releng/features/org.eclipse.ecf.eventadmin.examples.feature
%pom_disable_module releng/features/org.eclipse.ecf.remoteservice.examples.feature
%pom_disable_module releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature
@ -114,20 +114,24 @@ sed -i -e '/<module>examples/d' -e '/<module>tests/d' pom.xml
%pom_disable_module releng/features/org.eclipse.ecf.discovery.zookeeper.feature
%pom_disable_module providers/bundles/org.eclipse.ecf.provider.zookeeper
%pom_xpath_remove "feature/includes[@id='org.eclipse.ecf.discovery.zookeeper.feature']" releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml
sed -i -e '/provider.zookeeper/d' doc/bundles/org.eclipse.ecf.doc/build.properties
# Using latest rome requires non-trivial port
%pom_disable_module releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature
%pom_disable_module framework/bundles/org.eclipse.ecf.remoteservice.rest.synd
sed -i -e '/remoteservice.rest.synd/d' doc/bundles/org.eclipse.ecf.doc/build.properties
# Disable SLP provider, rhbz#1416706
%pom_disable_module releng/features/org.eclipse.ecf.discovery.slp.feature
%pom_disable_module providers/bundles/org.eclipse.ecf.provider.jslp
%pom_disable_module protocols/bundles/ch.ethz.iks.slp
%pom_xpath_remove "feature/includes[@id='org.eclipse.ecf.discovery.slp.feature']" releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml
sed -i -e '/provider.jslp/d' doc/bundles/org.eclipse.ecf.doc/build.properties
# Misc other providers that we don't need
%pom_disable_module releng/features/org.eclipse.ecf.discovery.dnssd.feature
%pom_disable_module providers/bundles/org.eclipse.ecf.provider.dnssd
sed -i -e '/provider.dnssd/d' doc/bundles/org.eclipse.ecf.doc/build.properties
%pom_disable_module protocols/bundles/org.jivesoftware.smack
%pom_disable_module providers/bundles/org.eclipse.ecf.provider.xmpp.datashare
%pom_disable_module providers/bundles/org.eclipse.ecf.provider.xmpp
@ -238,12 +242,32 @@ popd
%{_javadir}/eclipse/*
%if %{without bootstrap}
%files runtime -f .mfiles-runtime
%files sdk -f .mfiles-sdk
%endif
%changelog
* Thu Jun 18 2020 Mat Booth <mat.booth@redhat.com> - 3.14.8-1
- Update to latest upstream release
- License switch to EPL 2
* Fri Mar 20 2020 Mat Booth <mat.booth@redhat.com> - 3.14.7-1
- Update to latest upstream release
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.14.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Dec 19 2019 Mat Booth <mat.booth@redhat.com> - 3.14.6-3
- Full build
* Wed Dec 18 2019 Mat Booth <mat.booth@redhat.com> - 3.14.6-2
- Enable bootstrap mode
* Wed Dec 18 2019 Mat Booth <mat.booth@redhat.com> - 3.14.6-1
- Update to latest upstream release
* Mon Jul 01 2019 Mat Booth <mat.booth@redhat.com> - 3.14.5-3
- Add BSD to the license tag
@ -495,4 +519,4 @@ popd
- Review issues fixed.
* Wed Aug 8 2012 Krzysztof Daniel <kdaniel@redhat.com> 3.5.6-1
- Initial packaging.
- Initial packaging.

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (org.eclipse.ecf-1e6e8e72cbb77a0e359e409cd4d2a58d03a6428d.tar.xz) = 0e6c5539a0b12a5dd09070ea7a4b35f5ad5a96162fadcf6764a334fafa33d353c3e608da03d3f63bc5004365b4def1883212c95867564e24d6d465257c872320