From 4a61170af0b7b83e3ac3e3a9b926447fe236f65c Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: May 30 2019 15:35:09 +0000
Subject: Clean up unused maven metadata


---

diff --git a/eclipse.spec b/eclipse.spec
index e2be4cd..28f7750 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -41,7 +41,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        4.11
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:        EPL-2.0
 URL:            http://www.eclipse.org/
 
@@ -827,7 +827,6 @@ popd
 # Generate addition Maven metadata
 rm -rf .xmvn/ .xmvn-reactor
 %mvn_package "org.eclipse.osgi:" equinox-osgi
-%mvn_package "org.eclipse.equinox.http:" platform
 %mvn_package "org.eclipse.swt:" swt
 
 # Install Maven metadata for OSGi jars
@@ -835,20 +834,9 @@ for J in $OSGI_JARS ; do
   JAR=%{buildroot}%{_eclipsedir}/plugins/org.eclipse.${J}_*.jar
   VER=$(echo $JAR | sed -e "s/.*${J}_\(.*\)\.jar/\1/")
   %mvn_artifact "org.eclipse.osgi:$J:jar:$VER" $JAR
-  if [ "$J" = "osgi" ] ; then
-    %mvn_alias "org.eclipse.osgi:$J" "org.eclipse.osgi:org.eclipse.$J" "org.eclipse.tycho:org.eclipse.$J" "org.eclipse:$J"
-  else
-    %mvn_alias "org.eclipse.osgi:$J" "org.eclipse.osgi:org.eclipse.$J" "org.eclipse.tycho:org.eclipse.$J"
-  fi
+  %mvn_alias "org.eclipse.osgi:$J" "org.eclipse.osgi:org.eclipse.$J" "org.eclipse.platform:org.eclipse.$J"
 done
 
-
-# Install Maven metadata for Equinox HTTP Servlet
-JAR=%{buildroot}%{_eclipsedir}/plugins/org.eclipse.equinox.http.servlet_*.jar
-VER=$(echo $JAR | sed -e "s/.*_\(.*\)\.jar/\1/")
-%mvn_artifact "org.eclipse.equinox.http:equinox.http.servlet:jar:$VER" $JAR
-%mvn_alias "org.eclipse.equinox.http:equinox.http.servlet" "org.eclipse.equinox.http:servlet"
-
 # Install Maven metadata for SWT
 JAR=%{buildroot}%{_eclipsedir}/plugins/org.eclipse.swt_*.jar
 VER=$(echo $JAR | sed -e "s/.*_\(.*\)\.jar/\1/")
@@ -891,7 +879,7 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
 %{_eclipsedir}/swt.jar
 %{_jnidir}/swt.jar
 
-%files platform -f .mfiles-platform
+%files platform
 %{_bindir}/eclipse
 %{_eclipsedir}/eclipse
 %{_eclipsedir}/.eclipseproduct
@@ -1096,6 +1084,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
 %{_eclipsedir}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Fri May 24 2019 Mat Booth <mat.booth@redhat.com> - 1:4.11-11
+- Clean up unused maven metadata
+
 * Fri May 24 2019 Mat Booth <mat.booth@redhat.com> - 1:4.11-10
 - Add missing BR on google-gson