rpms/eclipse/F-11 eclipse.spec, 1.629, 1.630 eclipse-pde.build-add-package-build.patch, 1.12, 1.13

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7930/F-11

Modified Files:
	eclipse.spec eclipse-pde.build-add-package-build.patch 
Log Message:
- Fix package-build template to add target for -Dconfigs.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-11/eclipse.spec,v
retrieving revision 1.629
retrieving revision 1.630
diff -u -p -r1.629 -r1.630
--- eclipse.spec	22 Apr 2009 13:07:13 -0000	1.629
+++ eclipse.spec	18 Jun 2009 14:48:06 -0000	1.630
@@ -29,7 +29,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1491,6 +1491,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Thu Jun 18 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.2-11
+- Fix package-build template to add target for -Dconfigs.
+
 * Tue Apr 21 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.2-10
 - Update "package build" patch to not nest symlinks (Elliott Baron).
 - RHBZ#496963.

eclipse-pde.build-add-package-build.patch:

Index: eclipse-pde.build-add-package-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-11/eclipse-pde.build-add-package-build.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- eclipse-pde.build-add-package-build.patch	22 Apr 2009 13:07:13 -0000	1.12
+++ eclipse-pde.build-add-package-build.patch	18 Jun 2009 14:48:07 -0000	1.13
@@ -118,7 +118,7 @@ RCS file: templates/package-build/custom
 diff -N templates/package-build/customTargets-assemble-target.xml
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ templates/package-build/customTargets-assemble-target.xml	1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,12 @@
+@@ -0,0 +1,15 @@
 +<project>
 +	<!-- ===================================================================== -->
 +	<!-- Targets to assemble the built elements for particular configurations  -->
@@ -130,6 +130,9 @@ diff -N templates/package-build/customTa
 +	<target name="assemble. at id@">
 +		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 +	</target>
++	<target name="assemble. at id@. at configs@">
++		<ant antfile="${assembleScriptName}" dir="${buildDirectory}" />
++	</target>
 +</project>
 Index: templates/package-build/customTargets.xml
 ===================================================================
@@ -137,7 +140,7 @@ RCS file: templates/package-build/custom
 diff -N templates/package-build/customTargets.xml
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ templates/package-build/customTargets.xml	1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,147 @@
+@@ -0,0 +1,149 @@
 +<project name="Build specific targets and properties" default="noDefault">
 +
 +	<fail unless="type" message="Please set the ${type} property to 'feature', 'plugin' or 'fragment'." />
@@ -147,6 +150,8 @@ diff -N templates/package-build/customTa
 +	<!-- we need to do this because you can't expand variables in target names -->
 +	<copy file="${builder}/customTargets-assemble-target.xml" tofile="${buildDirectory}/customTargets-${id}-assemble-target.xml" />
 +	<replace file="${buildDirectory}/customTargets-${id}-assemble-target.xml" token="@id@" value="${id}" />
++	<replace file="${buildDirectory}/customTargets-${id}-assemble-target.xml" token="@configs@" value="${configs}" />              
++	<replace file="${buildDirectory}/customTargets-${id}-assemble-target.xml" token="," value="." />              
 +	<import file="${buildDirectory}/customTargets-${id}-assemble-target.xml" />
 +
 +	<!-- ===================================================================== -->