[eclipse] Move maven fragments and pom files in appropriate subpackages

[Stanislav Ochotnicky]

commit 8cdb377ebc4cedd9d3de15517ee1e621e73a490d
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Aug 1 11:30:14 2012 +0200

    Move maven fragments and pom files in appropriate subpackages

 eclipse.spec |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index 8c05b85..36abbaa 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -20,7 +20,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -144,8 +144,8 @@ Requires:   %{name}-rcp = %{epoch}:%{eclipse_version}-%{release}
 Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
 Requires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
 Requires: ant-scripts
-Requires: apache-commons-el >= 1.0-23 
-Requires: apache-commons-logging 
+Requires: apache-commons-el >= 1.0-23
+Requires: apache-commons-logging
 Requires: apache-commons-codec >= 1.6-2
 Requires: jakarta-commons-httpclient >= 1:3.1-7
 Requires: tomcat-lib >= 7.0.25-3
@@ -323,13 +323,13 @@ pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
 ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.osgi_*.jar osgi.jar
 popd
 install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.eclipse-osgi.pom
-%add_maven_depmap JPP.eclipse-osgi.pom %{name}/osgi.jar -a "org.eclipse:osgi,org.eclipse.tycho:org.eclipse.osgi"
+%add_maven_depmap JPP.eclipse-osgi.pom %{name}/osgi.jar -a "org.eclipse:osgi,org.eclipse.tycho:org.eclipse.osgi" -f equinox-osgi
 
 pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
 ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.osgi.services_*.jar osgi.services.jar
 popd
 install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.eclipse-osgi.services.pom
-%add_maven_depmap JPP.eclipse-osgi.services.pom %{name}/osgi.services.jar -a "org.eclipse.osgi:services"
+%add_maven_depmap JPP.eclipse-osgi.services.pom %{name}/osgi.services.jar -a "org.eclipse.osgi:services" -f equinox-osgi
 
 pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
 ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.osgi.util_*.jar osgi.util.jar
@@ -339,14 +339,13 @@ pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
 ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.servlet_*.jar equinox.http.servlet.jar
 popd
 install -m 0644 %{SOURCE7} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.eclipse-equinox.http.servlet.pom
-%add_maven_depmap JPP.eclipse-equinox.http.servlet.pom %{name}/equinox.http.servlet.jar -a "org.eclipse.equinox.http:servlet"
+%add_maven_depmap JPP.eclipse-equinox.http.servlet.pom %{name}/equinox.http.servlet.jar -a "org.eclipse.equinox.http:servlet" -f platform
 
 pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
 ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_*.jar jdt.core.jar
 popd
 install -m 0644 %{SOURCE8} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.eclipse-jdt.core.pom
-%add_maven_depmap JPP.eclipse-jdt.core.pom %{name}/jdt.core.jar -a "org.eclipse:jdt.core,org.eclipse.tycho:org.eclipse.jdt.core"
-
+%add_maven_depmap JPP.eclipse-jdt.core.pom %{name}/jdt.core.jar -a "org.eclipse:jdt.core,org.eclipse.tycho:org.eclipse.jdt.core"  -f jdt
 # A sanity check.
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
@@ -670,11 +669,15 @@ rm -rf %{_bindir}/efj/
 #%%{_libdir}/%%{name}/metadata
 %{_libdir}/%{name}/p2
 %{_javadir}/%{name}/equinox.http.servlet.jar
+%{_mavenpomdir}/JPP.%{name}-equinox.http.servlet.pom
+%{_mavendepmapfragdir}/%{name}-platform
 
 %files jdt
 %attr(0755,root,root) %{_bindir}/efj
 %{_libdir}/%{name}/dropins/jdt
 %{_javadir}/%{name}/jdt.core.jar
+%{_mavenpomdir}/JPP.%{name}-jdt.core.pom
+%{_mavendepmapfragdir}/%{name}-jdt
 
 %files pde
 %{_bindir}/%{name}-pdebuild
@@ -689,10 +692,13 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/plugins/org.eclipse.osgi_*
 %{_libdir}/%{name}/plugins/org.eclipse.osgi.services_*
 %{_libdir}/%{name}/plugins/org.eclipse.osgi.util_*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_mavenpomdir}/JPP.%{name}-osgi*.pom
+%{_mavendepmapfragdir}/%{name}-equinox-osgi
 
 %changelog
+* Wed Aug  1 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1:4.2.0-6
+- Move maven fragments and pom files in appropriate subpackages
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
@@ -743,7 +749,7 @@ rm -rf %{_bindir}/efj/
 - Update to latest eclipse-build.
 
 * Fri Apr 20 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-0.16.I201204171000
-- Bug 814332 - Documentation is not pointing to locally installed javadoc. 
+- Bug 814332 - Documentation is not pointing to locally installed javadoc.
 
 * Thu Apr 19 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-0.15.I201204171000
 - Amendment to previous release.
@@ -812,7 +818,7 @@ rm -rf %{_bindir}/efj/
 * Fri Mar 16 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:3.8.0-0.19.I201203141800
 - Update to I20120314-1800.
 - Eclipse-build updated to head.
-- Required Jsch version updated to include correct MANIFEST.MF 
+- Required Jsch version updated to include correct MANIFEST.MF
 
 * Sun Mar 11 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:3.8.0-0.18.I201203060800
 - Update to I20120228-0800.
@@ -964,7 +970,7 @@ rm -rf %{_bindir}/efj/
 * Fri Oct 14 2011 Sami Wagiaalla <swagiaal at redhat.com> 1:3.7.0-5
 - Change eclipse-reconciler script to run with no arguments.
 - Use initscripts to create run directory.
-- Run reconciler only once per install transaction. 
+- Run reconciler only once per install transaction.
 
 * Tue Oct 4 2011 Sami Wagiaalla <swagiaal at redhat.com> 1:3.7.0-5
 - New eclipse-build source tar ball.
@@ -985,14 +991,14 @@ rm -rf %{_bindir}/efj/
 - Do not install state files.
 
 * Mon Oct 3 2011 Sami Wagiaalla <swagiaal at redhat.com> 1:3.7.0-5
-- Add Requires post and postun platform to jdt and pde on 
+- Add Requires post and postun platform to jdt and pde on
 
 * Fri Sep 23 2011 Sami Wagiaalla <swagiaal at redhat.com> 1:3.7.0-4
 - Run reconciler after and before pde installation.
 
 * Fri Sep 23 2011 Sami Wagiaalla <swagiaal at redhat.com> 1:3.7.0-4
 - Add new script eclipse-reconciler.sh
-- Run eclipse-reconciler.sh in the post and postun sections of jdt 
+- Run eclipse-reconciler.sh in the post and postun sections of jdt
   and post seciton on platform.
 - Remove all old profiles in %%pre rcp.
 
@@ -1052,7 +1058,7 @@ rm -rf %{_bindir}/efj/
 - Drop bootstrap conditional.
 - Drop shell start script.
 - Drop jpp versioned dependencies - apache-commons-* have never had such versions.
-- Removed patches moved to eclipse-build. 
+- Removed patches moved to eclipse-build.
 
 * Fri Mar 11 2011 Alexander Kurtakov <akurtako at redhat.com> 1:3.6.2-0.1
 - First take on 3.6.2.