rpms/eclipse-cdt/devel .cvsignore, 1.11, 1.12 eclipse-cdt.spec, 1.20, 1.21 sources, 1.12, 1.13

[fedora-cvs-commits redhat com]

Author: overholt

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

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Log Message:
* Thu Jul 14 2005 Andrew Overholt <overholt redhat com> 3.0.0_fc-0.RC2.1
- Import new upstream version (3.0RC2).
- Use gbenson's new aot-compile-rpm and change requirements appropriately.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	28 Jun 2005 18:47:02 -0000	1.11
+++ .cvsignore	15 Jul 2005 03:11:37 -0000	1.12
@@ -1 +1 @@
-eclipse-cdt-fetched-src-3.0M7.tar.gz
+eclipse-cdt-fetched-src-3.0RC2.tar.gz


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- eclipse-cdt.spec	6 Jul 2005 19:49:03 -0000	1.20
+++ eclipse-cdt.spec	15 Jul 2005 03:11:37 -0000	1.21
@@ -1,5 +1,4 @@
 Epoch: 1
-ExclusiveArch: i386 x86_64 ppc
 
 %define gcj_support 		1
 %define pkg_summary		C/C++ Development Tools (CDT) plugin for Eclipse
@@ -22,14 +21,14 @@
 Summary: 	%{pkg_summary}
 Name: 		%{eclipse_name}-cdt
 Version: 	%{majmin}.%{micro}_fc
-Release: 	0.M7.1
+Release: 	0.RC2.1
 License:	Eclipse Public License - v 1.0 (EPL) <http://www.eclipse.org/legal/epl-v10.html>
 Group: 		Text Editors/Integrated Development Environments (IDE)
 URL:		http://www.eclipse.org/cdt
 Requires:	eclipse-platform
 
 
-Source0: %{name}-fetched-src-3.0M7.tar.gz
+Source0: %{name}-fetched-src-3.0RC2.tar.gz
 Patch1: %{name}-no-cvs2-patch
 Patch2: %{name}-platform-build-linux.patch
 Patch3: %{name}-sdk-build-linux.patch
@@ -40,22 +39,26 @@
 BuildRequires: eclipse-pde
 %if %{gcj_support}
 BuildRequires:  gcc-java >= 4.0.0-1
-BuildRequires:  java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_24rh
-Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_24rh
+BuildRequires:  java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_37rh
+Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_37rh
 %else
 BuildRequires:	java-devel >= 1.4.2
 %endif
 
 Requires: 	ctags gdb make
-Requires: 	eclipse-platform >= 3.1.0_fc-0.M7.9
+Requires: 	eclipse-platform >= 3.1.0_fc-1
 
+%if %{gcj_support}
+ExclusiveArch: %{ix86} x86_64 ppc
+%else
+BuildArch:     noarch
+%endif
 BuildRoot: 	%{_tmppath}/%{name}-buildroot
 
 %description
 The eclipse-cdt package contains Eclipse features and plugins that are
 useful for C and C++ development.
 
-
 %prep
 %setup -q -c 
 pushd "org.eclipse.cdt.releng"
@@ -97,7 +100,6 @@
 java -cp  $SDK/startup.jar \
     -Duser.home=$homedir \
     -Dosgi.install.area=%{eclipse_base} \
-    -Dorg.eclipse.core.runtime.ignoreLockFile=true \
      org.eclipse.core.launcher.Main \
     -application org.eclipse.ant.core.antRunner \
     -DjavacFailOnError=true \
@@ -111,24 +113,6 @@
 else
      buildArch=%{eclipse_arch}
 fi
-
-%if %{gcj_support}
-  mkdir native
-  for file in $(pwd)/results/I.*/*.tar.gz; do
-    case $file in
-      */org.eclipse.cdt-*-linux.$buildArch.*)
-  	 tar -zx -C native -f $file *.jar 
-           cd native
-           %ifarch %{ix86} ppc
-             find-and-aot-compile %{name}-native "-fPIC -fjni -O2"
-           %else
-             find-and-aot-compile %{name}-native "-fPIC -fjni -O1"
-           %endif
-           mv %{name}-native.tar.gz ..
-     ;;
-    esac
-  done	
-%endif
 popd
 
 %install
@@ -151,51 +135,6 @@
   esac
 done
 
-%if %{gcj_support}
-
-  # Create plugins directory in eclipse lib base
-  install -d -m755 $RPM_BUILD_ROOT/%{eclipse_lib_base}/plugins
-
-  cd org.eclipse.cdt.releng/native
-  tar zxf ../%{name}-native.tar.gz
-  mv %{name}-native/eclipse/plugins/* $RPM_BUILD_ROOT/%{eclipse_lib_base}/plugins
-
-  # Directory to hold all the .jar->.so mapping dbs
-  install -d -m 755 $RPM_BUILD_ROOT`gcj-dbtool -p %{_libdir}`
-  install -d -m 755 $RPM_BUILD_ROOT`gcj-dbtool -p %{_libdir}`.d
-
-  # Create the cdt database
-  gcjdbdir=$RPM_BUILD_ROOT`gcj-dbtool -p %{_libdir}`.d
-  mkdir -p $gcjdbdir
-  gcj-dbtool -n $gcjdbdir/%{name}.db 8000
-
-# FIXME: Commented out as part of FIXME below (.so to .so.bak mapping)
-  # Populate it
-#   for j in `find $RPM_BUILD_ROOT/%{eclipse_base} -name \*.jar`; do
-# 	lib=`echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
-# 	lib=`dirname $lib`/lib`basename $lib`;
-# 	ls -l $lib;
-# 	if [ -f $lib ]; then
-# 	  gcj-dbtool -f $gcjdbdir/%{name}.db \
-# 	    $j `echo $lib | sed "s:$RPM_BUILD_ROOT/::"`;
-# 	fi;
-#   done;
-
-  # FIXME: temporarily disable org.eclipse.cdt.managedbuilder.core_3.0.0/libmngbuildcore.jar.so
-  # see:  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=157123
-  mv \
-    $RPM_BUILD_ROOT/%{_libdir}/eclipse/plugins/org.eclipse.cdt.managedbuilder.core_3.0.0/libmngbuildcore.jar.so{,.bak}
-
-  # FIXME: moving all .so's to .so.bak due to bug in native compilation
-  pushd $RPM_BUILD_ROOT/%{_libdir}/eclipse/plugins/
-  for i in `find org.eclipse.cdt.* -name "*\.so"`; do
-  	mv $i $i".bak";
-  done;
-  popd
-
-%endif
-
-
 # We move the libraries to libdir, leaving symlinks behind.  And since
 # zip doesn't preserve file permissions, we must also mark all the .so
 # files as executable.
@@ -212,27 +151,30 @@
 done
 )
 
+%if %{gcj_support}
+aot-compile-rpm
+%endif
+
 %clean 
 rm -rf ${RPM_BUILD_ROOT}
 
 %if %{gcj_support}
 %post
-/usr/bin/rebuild-gcj-db %{_libdir}
+/usr/bin/rebuild-gcj-db
 
 %postun
-/usr/bin/rebuild-gcj-db %{_libdir}
+/usr/bin/rebuild-gcj-db
 %endif
 
-
 %files
 %defattr(-,root,root)
-%if %{gcj_support}
-%{eclipse_lib_base}/plugins/org.eclipse.cdt*
-%{_libdir}/gcj-4.0.0/classmap.db.d/%{name}.db
-%endif
 %{eclipse_base}/features/org.eclipse.cdt*
 %{eclipse_base}/plugins/org.eclipse.cdt*
-
+%{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux.x86_3.0.0/os/linux/x86/libpty.so
+%{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux.x86_3.0.0/os/linux/x86/libspawner.so
+%if %{gcj_support}
+%{_libdir}/gcj/%{name}
+%endif
 
 # Cannot get dir name org.eclipse.cdt.source.linux.*.x86_2.0.2 to glob
 # properly. Will fix later  
@@ -273,6 +215,10 @@
 
 
 %changelog
+* Thu Jul 14 2005 Andrew Overholt <overholt redhat com> 3.0.0_fc-0.RC2.1
+- Import new upstream version (3.0RC2).
+- Use gbenson's new aot-compile-rpm and change requirements appropriately.
+
 * Wed Jun 22 2005 Andrew Overholt <overholt redhat com> 3.0.0_fc-0.M7.1
 - Import new upstream version (3.0M7).
 - Remove refactoring/build.properties patch (now unneeeded).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	28 Jun 2005 18:47:02 -0000	1.12
+++ sources	15 Jul 2005 03:11:37 -0000	1.13
@@ -1 +1 @@
-93faff99a6ad2055d8f061508332dd48  eclipse-cdt-fetched-src-3.0M7.tar.gz
+e1b0dbf71502c7c43901fea431a91af8  eclipse-cdt-fetched-src-3.0RC2.tar.gz