rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.20,1.21

[fedora-cvs-commits redhat com]

Author: overholt

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

Modified Files:
	eclipse-bugzilla.spec 
Log Message:
* Fri Jul 15 2005 Andrew Overholt <overholt redhat com> 0.1.1_fc-3
- Use gbenson's new aot-compile-rpm.



Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- eclipse-bugzilla.spec	8 Jul 2005 17:05:24 -0000	1.20
+++ eclipse-bugzilla.spec	15 Jul 2005 15:02:24 -0000	1.21
@@ -22,7 +22,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}_fc
-Release:	2
+Release:	3
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -45,8 +45,9 @@
 BuildRequires: libswt3-gtk2
 %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
@@ -85,28 +86,6 @@
     -DbaseLocation=$SDK \
     -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.0/scripts \
     -DdontFetchAnything=true 
-
-%if %{gcj_support}
-  mkdir native
-  for file in $(pwd)/results/I.*/*.tar.gz; do
-    case $file in
-      *org.eclipse.team.bugzilla*)
-        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	
-
-  # We don't need any of this exploded tarball any more
-  rm -rf *
-%endif
-
 popd
 
 %install
@@ -125,34 +104,7 @@
 done
 
 %if %{gcj_support}
-
-  # Create plugins directory in eclipse lib base
-  install -d -m755 $RPM_BUILD_ROOT/%{eclipse_lib_base}/plugins
-
-  cd org.eclipse.team.bugzilla.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 
@@ -160,10 +112,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
@@ -172,12 +124,13 @@
 %{eclipse_base}/plugins/org.eclipse.team.bugzilla*
 %{eclipse_base}/plugins/org.eclipse.team.bugs*
 %if %{gcj_support}
-%{eclipse_lib_base}/plugins/org.eclipse.team.bugzilla*
-%{eclipse_lib_base}/plugins/org.eclipse.team.bugs*
-%{_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.1.1_fc-3
+- Use gbenson's new aot-compile-rpm.
+
 * Fri Jul 08 2005 Jeff Pound <jpound redhat com> 0.1.1_fc-2
 - Fix eclipse build specification to be arch independant.