commit 5f8bd6e294e84c4bc5fef20405d8f118be4f493b Merge: cd7e456 8b8323e Author: Mat Booth mat.booth@redhat.com Date: Wed Mar 4 09:52:37 2015 +0000
Merge branch 'f21' into f22
eclipse-emf.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) --- diff --cc eclipse-emf.spec index 7dd1077,6756ff8..7759d4b --- a/eclipse-emf.spec +++ b/eclipse-emf.spec @@@ -1,20 -1,18 +1,20 @@@ %{?scl:%scl_package eclipse-emf} %{!?scl:%global pkg_name %{name}}
-%global eclipse_dropin %{_datadir}/eclipse/dropins -%global git_tag R2_10_2 +# The core sub-package must be archful because it is required to be in +# libdir by the platform, but we have no natives, so suppress debuginfo +%global debug_package %{nil}
-%define __requires_exclude osgi* +%global eclipse_dropin %{_datadir}/eclipse/dropins - %global git_tag R2_10_1 ++%global git_tag R2_10_2
Name: %{?scl_prefix}eclipse-emf - Version: 2.10.1 - Release: 3%{?dist} + Version: 2.10.2 + Release: 1%{?dist} Summary: Eclipse Modeling Framework (EMF) Eclipse plug-in + License: EPL URL: http://www.eclipse.org/modeling/emf/ - Source0: http://git.eclipse.org/c/emf/org.eclipse.emf.git/snapshot/org.eclipse.emf-%%...
# look inside correct directory for platform docs @@@ -149,17 -183,9 +149,20 @@@ mv %{buildroot}%{eclipse_dropin}/emf-ru %{eclipse_dropin}/emf-examples
%changelog + * Wed Mar 04 2015 Mat Booth mat.booth@redhat.com - 2.10.2-1 + - Update to Luna SR2 release + +* Thu Nov 20 2014 Mat Booth mat.booth@redhat.com - 2.10.1-3 +- Qualifier must be same on all arches in archful builds + +* Wed Nov 19 2014 Mat Booth mat.booth@redhat.com - 2.10.1-2 +- Make core package archful so it can be installed into libdir + where eclipse-platform expects it to be +- Move eclipse-emf -> eclipse-emf-runtime, this is because we can have + noarch sub-packages of an archful package, but cannot have archful + sub-packages of a noarch package +- Fix some minor rpmlint errors + * Wed Oct 01 2014 Mat Booth mat.booth@redhat.com - 2.10.1-1 - Update to Luna SR1 release - Drop ancient obsoletes on emf-sdo package
eclipse-sig@lists.fedoraproject.org