Mon Oct 16 18:45:08 UTC 2006

Author: overholt

Update of /cvs/dist/rpms/eclipse-cdt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7171

Modified Files:
	eclipse-cdt.spec 
Removed Files:
	eclipse-cdt-platform-build-linux-ia64.patch 
	eclipse-cdt-platform-build-linux-ppc.patch 
	eclipse-cdt-platform-build-linux-x86.patch 
	eclipse-cdt-platform-build-linux-x86_64.patch 
	eclipse-cdt-platform-build-linux.patch 
	eclipse-cdt-sdk-build-linux-ia64.patch 
	eclipse-cdt-sdk-build-linux-ppc.patch 
	eclipse-cdt-sdk-build-linux-x86.patch 
	eclipse-cdt-sdk-build-linux-x86_64.patch 
	eclipse-cdt-sdk-build-linux.patch 
Log Message:
* Mon Oct 16 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.1-2
- Replace build patches with sed commands
- Resolves: #208622



Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62

--- eclipse-cdt.spec	16 Oct 2006 16:11:20 -0000	1.61
+++ eclipse-cdt.spec	16 Oct 2006 18:45:06 -0000	1.62
@@ -46,8 +46,6 @@
 Source1: %{name}-autotools-0.0.5.tar.gz
 
 Patch1: %{name}-no-cvs2-patch
-Patch2: %{name}-platform-build-linux-%{eclipse_arch}.patch
-Patch3: %{name}-sdk-build-linux-%{eclipse_arch}.patch
 Patch4: %{name}-no-tests.patch
 Patch5: %{name}-subconsole.patch
 Patch6: %{name}-scannerinfoplus.patch
@@ -89,8 +87,15 @@
 %setup -q -c 
 pushd "org.eclipse.cdt.releng"
 %patch1 -p0
-%patch2 -p0
-%patch3 -p0
+# Only build for the platform on which we're building
+pushd platform
+sed --in-place -e "74,82d" build.properties
+sed --in-place -e "s:configs=\\\:configs=linux,gtk,%{arch}:" build.properties
+popd
+pushd sdk
+sed --in-place -e "74,82d" build.properties
+sed --in-place -e "s:configs=\\\:configs=linux,gtk,%{arch}:" build.properties
+popd
 %patch4 -p0
 %patch5 -p0
 %patch6 -p0
@@ -271,6 +276,10 @@
 
 %changelog
 * Mon Oct 16 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.1-2
+- Replace build patches with sed commands
+- Resolves: #208622
+
+* Mon Oct 16 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.1-2
 - Fix build so only single platform is built at a time
 - Bugzilla 208622
 


--- eclipse-cdt-platform-build-linux-ia64.patch DELETED ---


--- eclipse-cdt-platform-build-linux-ppc.patch DELETED ---


--- eclipse-cdt-platform-build-linux-x86.patch DELETED ---


--- eclipse-cdt-platform-build-linux-x86_64.patch DELETED ---


--- eclipse-cdt-platform-build-linux.patch DELETED ---


--- eclipse-cdt-sdk-build-linux-ia64.patch DELETED ---


--- eclipse-cdt-sdk-build-linux-ppc.patch DELETED ---


--- eclipse-cdt-sdk-build-linux-x86.patch DELETED ---


--- eclipse-cdt-sdk-build-linux-x86_64.patch DELETED ---


--- eclipse-cdt-sdk-build-linux.patch DELETED ---


