rpms/jakarta-commons-el/devel jakarta-commons-el.spec,1.20,1.21

[fedora-cvs-commits redhat com]

Author: gbenson

Update of /cvs/dist/rpms/jakarta-commons-el/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29204

Modified Files:
	jakarta-commons-el.spec 
Log Message:
Bootstrap servletapi5


Index: jakarta-commons-el.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-el/devel/jakarta-commons-el.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jakarta-commons-el.spec	27 Jun 2005 13:13:01 -0000	1.20
+++ jakarta-commons-el.spec	19 Jul 2005 12:39:05 -0000	1.21
@@ -5,7 +5,7 @@
 
 Name:           %{name}
 Version:        1.0
-Release:        4jpp_1fc
+Release:        4jpp_2fc
 Epoch:          0
 Summary:        The Jakarta Commons Extension Language
 License:        Apache Software License
@@ -18,10 +18,9 @@
 BuildRequires:  jpackage-utils >= 0:1.5.30
 BuildRequires:  servletapi5
 # libgcj aot-compiled native libraries
-BuildRequires:         gcc-java >= 4.0.0-0.43
-BuildRequires:         java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
-Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
-ExclusiveArch:         %{ix86} x86_64 ppc alpha
+BuildRequires:    java-gcj-compat-devel >= 1.0.31
+Requires(post):   java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
 
 %description
 An implementation of standard interfaces and abstract classes for
@@ -59,16 +58,6 @@
   -Dj2se.javadoc=%{_javadocdir}/java \
   jar javadoc
 
-gcj-dbtool -n dist/%{name}-%{version}.db 128
-aot-compile \
-    dist/%{short_name}.jar \
-    dist/lib%{name}-%{version}.jar.so \
-    "$RPM_OPT_FLAGS -fPIC"
-gcj-dbtool -f \
-    dist/%{name}-%{version}.db \
-    dist/%{short_name}.jar \
-    %{_libdir}/lib%{name}-%{version}.jar.so
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -84,14 +73,7 @@
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
-# solibs
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-cp -p dist/lib*.jar.so $RPM_BUILD_ROOT%{_libdir}
-
-# gcjdb
-gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
-mkdir -p $RPM_BUILD_ROOT$gcjdbdir
-cp -p dist/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
+aot-compile-rpm
 
 
 %clean
@@ -99,10 +81,10 @@
 
 
 %post
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %postun
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %post javadoc
 rm -f %{_javadocdir}/%{name}
@@ -113,8 +95,7 @@
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt STATUS.html
 %{_javadir}/*
-%attr(0755,root,root) %{_libdir}/*.so
-%{_libdir}/*/*/*.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -123,6 +104,10 @@
 
 
 %changelog
+* Tue Jul 19 2005 Gary Benson <gbenson at redhat.com> - 0:1.0-4jpp_2fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm.
+
 * Thu Jun 14 2005 Gary Benson <gbenson at redhat.com> - 0:1.0-4jpp_1fc
 - Upgrade to 1.0-4jpp.