[eclipse-jbosstools/f19: 4/36] Clean up prep section

[Gerard Ryan]

commit 1d6377166315ba381d70d0cae6cc907f609312ae
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Mon Jan 21 00:09:06 2013 +0000

    Clean up prep section

 eclipse-jbosstools.spec |   84 +++++++++++++---------------------------------
 1 files changed, 24 insertions(+), 60 deletions(-)
---
diff --git a/eclipse-jbosstools.spec b/eclipse-jbosstools.spec
index d9eab6e..810626a 100644
--- a/eclipse-jbosstools.spec
+++ b/eclipse-jbosstools.spec
@@ -7,7 +7,7 @@
 
 Name:           eclipse-jbosstools
 Version:        4.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Eclipse plugins that support JBoss and related technology
 
 Group:          Development/Tools
@@ -417,46 +417,18 @@ ln -s %{_javadir}/slf4j/log4j12.jar slf4j-log4j12.jar
 popd
 
 #Fix relative locations of parent POM in certain places
+bad_relative_parent_locations="base freemarker javaee jst openshift server"
+for place in ${bad_relative_parent_locations}; do
+    %pom_xpath_remove "pom:parent/pom:relativePath" ${place}
+    %pom_xpath_inject "pom:parent" \
+                      "<relativePath>../build/parent/pom.xml</relativePath>" \
+                      ${place}
+done
 %pom_xpath_remove "pom:parent/pom:relativePath" build-sites/aggregate
 %pom_xpath_inject "pom:parent" \
                   "<relativePath>../../build/parent/pom.xml</relativePath>" \
                   build-sites/aggregate
 
-%pom_xpath_remove "pom:parent/pom:relativePath" base
-%pom_xpath_inject "pom:parent" \
-                  "<relativePath>../build/parent/pom.xml</relativePath>" \
-                  base
-
-%pom_xpath_remove "pom:parent/pom:relativePath" freemarker
-%pom_xpath_inject "pom:parent" \
-                  "<relativePath>../build/parent/pom.xml</relativePath>" \
-                  freemarker
-
-
-%pom_xpath_remove "pom:parent/pom:relativePath" javaee
-%pom_xpath_inject "pom:parent" \
-                  "<relativePath>../build/parent/pom.xml</relativePath>" \
-                  javaee
-
-%pom_xpath_remove "pom:parent/pom:relativePath" jst
-%pom_xpath_inject "pom:parent" \
-                  "<relativePath>../build/parent/pom.xml</relativePath>" \
-                  jst
-
-%pom_xpath_remove "pom:parent/pom:relativePath" openshift
-%pom_xpath_inject "pom:parent" \
-                  "<relativePath>../build/parent/pom.xml</relativePath>" \
-                  openshift
-
-
-%pom_xpath_remove "pom:parent/pom:relativePath" server
-%pom_xpath_inject "pom:parent" \
-                  "<relativePath>../build/parent/pom.xml</relativePath>" \
-                  server
-
-
-
-
 # Disable modules that fail to build
 ## build-site/aggregate/local-site
 %pom_disable_module ../../../gwt build-sites/aggregate/local-site
@@ -467,12 +439,15 @@ popd
 %pom_disable_module ../../../portlet build-sites/aggregate/local-site
 %pom_disable_module ../../../central build-sites/aggregate/local-site
 %pom_disable_module ../../../vpe build-sites/aggregate/local-site
+## tests
+disable_tests_module="base base/common base/runtime base/usage \
+               server/archives server/jmx server/as \
+               jst webservices javaee/cdi freemarker openshift"
+for pom in ${disable_tests_module}; do %pom_disable_module tests ${pom}; done
+## site
+disable_site_module="base server jst webservices javaee freemarker openshift"
+for pom in ${disable_site_module}; do %pom_disable_module site ${pom}; done
 ## base
-%pom_disable_module site base
-%pom_disable_module tests base
-%pom_disable_module tests base/common
-%pom_disable_module tests base/runtime
-%pom_disable_module tests base/usage
 %pom_disable_module org.jboss.tools.common.mylyn base/common/plugins
 %pom_disable_module org.jboss.tools.common.mylyn.test base/common/tests
 %pom_disable_module org.jboss.tools.common.mylyn.feature base/common/features
@@ -480,39 +455,28 @@ popd
 %pom_disable_module org.jboss.tools.usage.test.feature base/usage/features
 %pom_disable_module org.jboss.tools.runtime.test.feature base/runtime/features
 ## server
-%pom_disable_module site server
-%pom_disable_module tests server/archives
-%pom_disable_module org.jboss.ide.eclipse.archives.test.feature server/archives/features
-%pom_disable_module tests server/jmx
+%pom_disable_module org.jboss.ide.eclipse.archives.test.feature \
+                    server/archives/features
 %pom_disable_module org.jboss.tools.jmx.test.feature server/jmx/features
-%pom_disable_module tests server/as
 %pom_disable_module org.jboss.ide.eclipse.as.test.feature server/as/features
 ## jst
-%pom_disable_module site jst
-%pom_disable_module tests jst
 %pom_disable_module org.jboss.tools.jst.test.feature jst/features
 ## webservices
-%pom_disable_module site webservices
-%pom_disable_module tests webservices
 %pom_disable_module org.jboss.tools.ws.test.feature webservices/features
 ## javaee
 %pom_disable_module jsf javaee
 %pom_disable_module seam javaee
 %pom_disable_module struts javaee
-%pom_disable_module site javaee
-%pom_disable_module tests javaee/cdi
-%pom_disable_module tests javaee/seam
 %pom_disable_module org.jboss.tools.cdi.test.feature javaee/cdi/features
 %pom_disable_module org.jboss.tools.cdi.seam.test.feature javaee/cdi/features
-%pom_disable_module org.jboss.tools.cdi.deltaspike.test.feature javaee/cdi/features
+%pom_disable_module org.jboss.tools.cdi.deltaspike.test.feature \
+                    javaee/cdi/features
 ## freemarker
-%pom_disable_module site freemarker
-%pom_disable_module tests freemarker
-%pom_disable_module org.jboss.ide.eclipse.freemarker.test.feature freemarker/features
+%pom_disable_module org.jboss.ide.eclipse.freemarker.test.feature \
+                    freemarker/features
 ## openshift
-%pom_disable_module site openshift
-%pom_disable_module tests openshift
-pom_disable_module org.jboss.tools.openshift.egit.integration.test.feature openshift/features
+pom_disable_module org.jboss.tools.openshift.egit.integration.test.feature \
+                   openshift/features
 
 %patch10
 %patch12