rpms/eclipse-pydev/devel eclipse-pydev-build.properties.patch, NONE, 1.1 eclipse-pydev-customTargets.xml.patch, NONE, 1.1 eclipse-pydev.spec, 1.8, 1.9

[fedora-cvs-commits redhat com]

Author: overholt

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

Modified Files:
	eclipse-pydev.spec 
Added Files:
	eclipse-pydev-build.properties.patch 
	eclipse-pydev-customTargets.xml.patch 
Log Message:
* Fri Jul 15 2005 Andrew Overholt <overholt redhat com> 0.9.3_fc-10
- Use gbenson's new aot-compile-rpm.


eclipse-pydev-build.properties.patch:
 build.properties |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE eclipse-pydev-build.properties.patch ---
--- build.properties.orig	2005-07-15 11:23:51.000000000 -0400
+++ build.properties	2005-07-15 11:24:39.000000000 -0400
@@ -60,7 +60,10 @@
 #     configs=win32,win32,x86 & linux,motif,x86
 # By default the value is *,*,*
 configs=\
-      linux,gtk,x86
+        *,*,*
+
+archivesFormat=\
+        *,*,*-tar
 
 #Arguments to send to the zip executable
 zipargs=

eclipse-pydev-customTargets.xml.patch:
 customTargets.xml |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE eclipse-pydev-customTargets.xml.patch ---
--- customTargets.xml.orig	2005-07-15 11:23:55.000000000 -0400
+++ customTargets.xml	2005-07-15 11:24:13.000000000 -0400
@@ -53,7 +53,7 @@
 <!-- Add one target for each root element and each configuration -->
 <!-- ===================================================================== -->
 
-<target name="assemble.org.python.pydev.feature.linux.gtk.x86">
+<target name="assemble.org.python.pydev.feature">
 	<property name="archiveName" value="eclipse-pydev.tar.gz" />
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 </target>


Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eclipse-pydev.spec	12 Jul 2005 15:06:10 -0000	1.8
+++ eclipse-pydev.spec	15 Jul 2005 15:29:56 -0000	1.9
@@ -1,5 +1,4 @@
 Epoch: 1
-ExclusiveArch: i386 ppc x86_64
 
 %define gcj_support 		1
 %define pkg_summary		Eclipse Python development plug-in
@@ -22,7 +21,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-pydev
 Version: 	%{version_majmin}.%{version_micro}_fc
-Release:	9
+Release:	10
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -39,18 +38,26 @@
 # things in the releng build.xml.
 
 Source0: eclipse-pydev-fetched-HEAD-0.9.3.tar.gz
+Patch0: eclipse-pydev-customTargets.xml.patch
+Patch1: eclipse-pydev-build.properties.patch
 
 BuildRequires: eclipse-platform
 BuildRequires: eclipse-jdt
 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_18rh
-Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh
+BuildRequires:    java-gcj-compat-devel >= 1.0.31
+Requires(post):   java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
 %else
 BuildRequires:	java-devel >= 1.4.2
 %endif
 
+%if %{gcj_support}
+ExclusiveArch: %{ix86} x86_64 ppc
+%else
+BuildArch:     noarch
+%endif
 BuildRoot: %{_tmppath}/%{name}-buildroot
 
 %description
@@ -59,6 +66,10 @@
 
 %prep
 %setup -q -c 
+pushd org.python.pydev.releng
+%patch0
+%patch1
+popd
 
 %build
 
@@ -85,25 +96,6 @@
     -DbaseLocation=$SDK \
     -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.0/scripts \
     -DdontFetchAnything=true 
-
-%if %{gcj_support}
-  mkdir native
-  pwd
-  for file in results/I.*/*.tar.gz; do
-    case $file in
-      *eclipse-pydev*)
-  	 tar -zx -C native -f $file *.jar 
-           cd native
-           %ifarch %{ix86} ppc
-             find-and-aot-compile %{name}-native "-fPIC -fjni -O2 -g"
-           %else
-             find-and-aot-compile %{name}-native "-fPIC -fjni -O1 -g"
-           %endif
-           mv %{name}-native.tar.gz ..
-     ;;
-    esac
-  done	
-%endif
 popd
 
 %install
@@ -122,34 +114,7 @@
 done
 
 %if %{gcj_support}
-
-  # Create plugins directory in eclipse lib base
-  install -d -m755 $RPM_BUILD_ROOT/%{eclipse_lib_base}/plugins
-
-  cd org.python.pydev.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 pydev database
-  gcjdbdir=$RPM_BUILD_ROOT`gcj-dbtool -p %{_libdir}`.d
-  mkdir -p $gcjdbdir
-  gcj-dbtool -n $gcjdbdir/%{name}.db 8000
-
-  # 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;
-
+aot-compile-rpm
 %endif
 
 %clean 
@@ -157,10 +122,10 @@
 
 %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
@@ -168,11 +133,13 @@
 %{eclipse_base}/features/org.python.pydev*
 %{eclipse_base}/plugins/org.python.pydev*
 %if %{gcj_support}
-%{eclipse_lib_base}/plugins/org.python.pydev*
-%{_libdir}/gcj-4.0.0/classmap.db.d/%{name}.db
+%{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Fri Jul 15 2005 Andrew Overholt <overholt redhat com> 0.9.3_fc-10
+- Use gbenson's new aot-compile-rpm.
+
 * Fri Jul 08 2005 Jeff Pound <jpound redhat com> 0.9.3_fc-9
 - Fix eclipse build specification to be arch independant.
 - Fix build.properties javacDebugInfo flag (Robin Green bz#161534)