From 27c17fddc98503dd91d1ee3a570c27fcda4908af Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Apr 19 2017 10:24:17 +0000
Subject: Make package noarch now that Eclipse is in the same location on all arches

Drop old obsoletes/provides

---

diff --git a/eclipse-emf.spec b/eclipse-emf.spec
index 034631e..e994ffd 100644
--- a/eclipse-emf.spec
+++ b/eclipse-emf.spec
@@ -1,12 +1,10 @@
-# 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}
+%global _eclipsedir %{_prefix}/lib/eclipse
 
 %global git_tag R2_12_0
 
 Name:      eclipse-emf
 Version:   2.12.0
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   Eclipse Modeling Framework (EMF) Eclipse plug-in
 
 License:   EPL
@@ -22,12 +20,14 @@ Patch1:    fix-build-properties.patch
 # Fix test dependency on missing RAP bundles
 Patch2:    remove-rap-dependency.patch
 
-BuildRequires: tycho >= 0.23.0
-BuildRequires: tycho-extras >= 0.23.0
+BuildRequires: tycho
+BuildRequires: tycho-extras
 BuildRequires: eclipse-filesystem
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-xsd
 
+BuildArch: noarch
+
 %description
 The Eclipse Modeling Framework (EMF) allows developers to build tools and
 other applications based on a structured data model. From a model
@@ -47,12 +47,6 @@ EMF bundles required by eclipse-platform.
 %package   runtime
 Summary:   Eclipse Modeling Framework (EMF) Eclipse plug-in
 
-# Obsoletes/provides added in F22
-Obsoletes: %{name} < %{version}-%{release}
-Provides:  %{name} = %{version}-%{release}
-
-BuildArch: noarch
-
 %description runtime
 The Eclipse Modeling Framework (EMF) allows developers to build tools and
 other applications based on a structured data model. From a model
@@ -64,16 +58,12 @@ basic editor.
 %package   tests
 Summary:   Eclipse EMF Tests
 
-BuildArch: noarch
-
 %description tests
 Tests for the Eclipse Modeling Framework (EMF) plug-in.
 
 %package   sdk
 Summary:   Eclipse EMF SDK
 
-BuildArch: noarch
-
 %description sdk
 Documentation and developer resources for the Eclipse Modeling Framework
 (EMF) plug-in.
@@ -82,8 +72,6 @@ Documentation and developer resources for the Eclipse Modeling Framework
 Summary:   Eclipse EMF examples
 Requires:  %{name}-sdk = %{version}-%{release}
 
-BuildArch: noarch
-
 %description examples
 Install-able versions of the example projects from the SDKs that demonstrate
 how to use the Eclipse Modeling Framework (EMF) plug-ins.
@@ -135,10 +123,10 @@ find doc -name pom.xml -exec sed -i -e 's/^  <groupId>\(.*\)</  <groupId>\1.doc<
 %mvn_package "::pom::" __noinstall
 %mvn_package "org.eclipse.emf.tests:" tests
 %mvn_package "::jar:{sources,sources-feature}:" sdk
-%mvn_package ":org.eclipse.emf.{sdk,example.installer}" sdk
+%mvn_package ":org.eclipse.emf.{license,sdk,example.installer}" sdk
 %mvn_package "org.eclipse.emf.doc:" sdk
-%mvn_package "org.eclipse.emf.features:org.eclipse.emf.{base,common,ecore}" core
-%mvn_package "org.eclipse.emf:org.eclipse.emf.{common,ecore,ecore.change,ecore.xmi}" core
+%mvn_package "org.eclipse.emf.features:org.eclipse.emf.{base,common,ecore}"
+%mvn_package "org.eclipse.emf:org.eclipse.emf.{common,ecore,ecore.change,ecore.xmi}"
 %mvn_package "org.eclipse.emf.examples:" examples
 %mvn_package ":" runtime
 
@@ -151,17 +139,17 @@ QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +v%Y%m%d-%H%M)
 %mvn_install
 
 # Move to libdir due to being part of core platform
-install -d -m 755 %{buildroot}%{_libdir}/eclipse
-mv %{buildroot}%{_datadir}/eclipse/droplets/emf-core/eclipse/{plugins,features} %{buildroot}%{_libdir}/eclipse
-rm -r %{buildroot}%{_datadir}/eclipse/droplets/emf-core
+install -d -m 755 %{buildroot}%{_eclipsedir}
+mv %{buildroot}%{_datadir}/eclipse/droplets/emf/eclipse/{plugins,features} %{buildroot}%{_eclipsedir}
+rm -r %{buildroot}%{_datadir}/eclipse/droplets/emf
 
 # Fixup metadata
-sed -i -e 's|%{_datadir}/eclipse/droplets/emf-core/eclipse|%{_libdir}/eclipse|' %{buildroot}%{_datadir}/maven-metadata/eclipse-emf-core.xml
-sed -i -e 's|%{_datadir}/eclipse/droplets/emf-core/eclipse/features/|%{_libdir}/eclipse/features/|' \
-       -e 's|%{_datadir}/eclipse/droplets/emf-core/eclipse/plugins/|%{_libdir}/eclipse/plugins/|' .mfiles-core
-sed -i -e '/droplets/d' .mfiles-core
+sed -i -e 's|%{_datadir}/eclipse/droplets/emf/eclipse|%{_eclipsedir}|' %{buildroot}%{_datadir}/maven-metadata/eclipse-emf.xml
+sed -i -e 's|%{_datadir}/eclipse/droplets/emf/eclipse/features/|%{_eclipsedir}/features/|' \
+       -e 's|%{_datadir}/eclipse/droplets/emf/eclipse/plugins/|%{_eclipsedir}/plugins/|' .mfiles
+sed -i -e '/droplets/d' .mfiles
 
-%files core -f .mfiles-core
+%files core -f .mfiles
 
 %files runtime -f .mfiles-runtime
 
@@ -172,6 +160,10 @@ sed -i -e '/droplets/d' .mfiles-core
 %files examples -f .mfiles-examples
 
 %changelog
+* Thu Apr 06 2017 Mat Booth <mat.booth@redhat.com> - 2.12.0-5
+- Make package noarch now that Eclipse is in the same location on all arches
+- Drop old obsoletes/provides
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild