rpms/eclipse-cdt/devel eclipse-cdt.spec,1.127,1.128

[Jeff Johnston]

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8615

Modified Files:
	eclipse-cdt.spec 
Log Message:

* Fri Jul 24 2009 Jeff Johnston <jjohnstn at redhat.com> 1:6.0.0-5
- Remove gcj_support.





Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- eclipse-cdt.spec	24 Jul 2009 20:51:26 -0000	1.127
+++ eclipse-cdt.spec	24 Jul 2009 22:38:32 -0000	1.128
@@ -1,6 +1,5 @@
 Epoch: 1
 
-%define gcj_support             1
 %define run_tests               0
 %define ship_tests              0
 %define major                   6
@@ -21,7 +20,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -83,15 +82,7 @@ Patch13: %{name}-testaggregation.patch
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
 BuildRequires: eclipse-rse >= 3.0
-%if %{gcj_support}
-BuildRequires:  gcc-java >= 4.0.2
-BuildRequires:  java-gcj-compat-devel >= 1.0.64
-BuildRequires:  unzip >= 5.52
-Requires(post):   java-gcj-compat >= 1.0.64
-Requires(postun): java-gcj-compat >= 1.0.64
-%else
 BuildRequires:  java-devel >= 1.4.2
-%endif
 %if %{run_tests}
 BuildRequires:  vnc-server
 BuildRequires:  w3m
@@ -102,11 +93,7 @@ Requires:       eclipse-platform >= 1:3.
 Requires:	eclipse-rse >= 3.0
 
 # Currently, upstream CDT only supports building on the platforms listed here.
-%if %{gcj_support}
-ExclusiveArch: %{ix86} x86_64 ppc ia64
-%else
 ExclusiveArch: %{ix86} x86_64 ppc ia64
-%endif
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 %description
@@ -178,7 +165,7 @@ sed --in-place -e "74,82d" build.propert
 sed --in-place -e "s:configs=\\\:configs=linux,gtk,%{eclipse_arch}:" build.properties
 popd
 pushd master
-sed --in-place -e "74,82d" build.properties
+sed --in-place -e "81,89d" build.properties
 sed --in-place -e "s:configs= \\\:configs=linux,gtk,%{eclipse_arch}:" build.properties
 popd
 pushd platform
@@ -186,6 +173,10 @@ sed --in-place -e "74,82d" build.propert
 sed --in-place -e "s:configs=.*\\\:configs=linux,gtk,%{eclipse_arch}:" build.properties
 popd
 
+# build.xml assumes we build all configs, but we only build one so update 
+# build.xml directory reference to be accurate.
+sed --in-place -e "s:linux.gtk.x86:linux.gtk.%{eclipse_arch}:g" build.xml
+
 popd
 
 ## Autotools stuff
@@ -281,6 +272,8 @@ java -cp $SDK/startup.jar \
      -XX:CompileCommand="exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding" \
      org.eclipse.core.launcher.Main             \
      -application org.eclipse.ant.core.antRunner \
+     -DjavacSource=1.5 \
+     -DjavacTarget=1.5 \
      -Duser.home=$homedir                        \
      -Dtype=feature                                    \
      -Did=org.eclipse.linuxtools.cdt.autotools.feature \
@@ -470,10 +463,6 @@ rm -rf ${installDir}-tests
 %endif
 %endif
 
-%if %{gcj_support}
-aot-compile-rpm
-%endif
-
 %if %{run_tests}
 %check
 installDir=${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/cdt
@@ -500,26 +489,9 @@ rm -rf ${installDir}-tests
 %clean 
 rm -rf ${RPM_BUILD_ROOT}
 
-%if %{gcj_support}
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-%{_bindir}/rebuild-gcj-db
-fi
-
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-%{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(-,root,root)
 %{eclipse_base}/dropins/cdt
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}
-%endif
 
 %files sdk
 %defattr(-,root,root)
@@ -536,6 +508,9 @@ fi
 %endif
 
 %changelog
+* Fri Jul 24 2009 Jeff Johnston <jjohnstn at redhat.com> 1:6.0.0-5
+- Remove gcj_support.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:6.0.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild