[eclipse] Fixed the generated eclipse.ini Fixed the content of generated swt.jar. Use maven macro to track pom

[Krzysztof Daniel]

commit f64e087adc5b0f28baa6a12169d0cab739d7991c
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Tue Feb 5 13:24:41 2013 +0100

    Fixed the generated eclipse.ini
    Fixed the content of generated swt.jar.
    Use maven macro to track poms in %%files section.

 eclipse.spec |   50 ++++++++++++++++++++++++--------------------------
 1 files changed, 24 insertions(+), 26 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index fc53628..a376c18 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -51,7 +51,7 @@ fi;
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        0.1.git201301281400%{?dist}
+Release:        0.2.git201301281400%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -554,17 +554,17 @@ sed -i "s|-Xms40m|-Xms128m|g" eclipse.ini
 sed -i "s|-Xmx384m|-Xmx512m|g" eclipse.ini
 sed -i '1i-preventMasterEclipseLaunch' eclipse.ini
 
-cat << EOF >> eclipse.ini
-	-Dorg.eclipse.swt.browser.UseWebKitGTK=true
-	-Dhelp.lucene.tokenizer=standard
-	-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith
-	-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>
-	-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate
-	-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding
-	-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile
-	-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState
-	-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins
-EOF 
+cat >> eclipse.ini <<EOF
+-Dorg.eclipse.swt.browser.UseWebKitGTK=true
+-Dhelp.lucene.tokenizer=standard
+-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith
+-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>
+-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate
+-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding
+-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile
+-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState
+-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins
+EOF
 
 popd #eclipse
 
@@ -626,7 +626,10 @@ popd
 pushd $RPM_BUILD_ROOT/%{_libdir}/%{name}
 pushd plugins
 SWT_JAR=`ls | grep swt.gtk`
-zip "${SWT_JAR}.jar" ${SWT_JAR}/*
+#it's a dir now
+cd ${SWT_JAR}
+#zip the contents
+zip -r "../${SWT_JAR}.jar" *
 popd
     ln -s  %{_libdir}/%{name}/plugins/"${SWT_JAR}.jar" swt.jar
     ln -s  %{_libdir}/%{name}/plugins/"${SWT_JAR}.jar" swt-gtk.jar
@@ -761,7 +764,7 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/java/swt.jar
 
 
-%files platform
+%files platform -f .mfiles-platform
 %attr(0755,root,root) %{_bindir}/%{name}
 %{_libdir}/%{name}/.eclipseproduct
 %config %{_libdir}/%{name}/eclipse.ini
@@ -974,16 +977,10 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/p2
 %{_libdir}/%{name}/about.html
 %{_libdir}/%{name}/about_files/
-%{_javadir}/%{name}/equinox.http.servlet.jar
-%{_mavenpomdir}/JPP.%{name}-equinox.http.servlet.pom
-%{_mavendepmapfragdir}/%{name}-platform
 
-%files jdt
+%files jdt -f .mfiles-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
@@ -994,18 +991,19 @@ rm -rf %{_bindir}/efj/
 %{_bindir}/%{name}-runEclipsePackageTests
 %{_javadir}/%{name}-testing
 
-%files equinox-osgi
+%files equinox-osgi -f .mfiles-equinox-osgi
 %dir %{_javadir}/%{name}
-%{_javadir}/%{name}/osgi.jar
-%{_javadir}/%{name}/osgi.services.jar
 %{_javadir}/%{name}/osgi.util.jar
 %{_libdir}/%{name}/plugins/org.eclipse.osgi_*
 %{_libdir}/%{name}/plugins/org.eclipse.osgi.services_*
 %{_libdir}/%{name}/plugins/org.eclipse.osgi.util_*
-%{_mavenpomdir}/JPP.%{name}-osgi*.pom
-%{_mavendepmapfragdir}/%{name}-equinox-osgi
 
 %changelog
+* Tue Feb 5 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.0-0.2.git201301281400
+- Fixed the generated eclipse.ini
+- Fixed the content of generated swt.jar.
+- Use maven macro to track poms in %%files section.
+
 * Thu Jan 31 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.0-0.1.git20121217
 - Update to Kepler.