rpms/oldkilim/devel oldkilim.spec,1.7,1.8

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/oldkilim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3274

Modified Files:
	oldkilim.spec 
Log Message:
Switch to aot-compile-rpm and build on ia64, ppc64, s390 and s390x


Index: oldkilim.spec
===================================================================
RCS file: /cvs/dist/rpms/oldkilim/devel/oldkilim.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- oldkilim.spec	27 Jun 2005 13:13:02 -0000	1.7
+++ oldkilim.spec	29 Jul 2005 13:34:36 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		oldkilim
 Version:	1.1.3
-Release:	2jpp_2fc
+Release:	2jpp_3fc
 Epoch:		0
 Summary:	A generic configuration framework for Java
 License:	BSD
@@ -15,10 +15,9 @@
 BuildRequires:	nanoxml-lite
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 # 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
 Kilim is a generic configuration framework for Java, which can be used
@@ -49,16 +48,6 @@
 popd
 ant distrib javadoc
 
-gcj-dbtool -n distrib/%{name}-%{version}.db 128
-aot-compile \
-    distrib/kilim.jar \
-    distrib/lib%{name}-%{version}.jar.so \
-    "$RPM_OPT_FLAGS -fPIC"
-gcj-dbtool -f \
-    distrib/%{name}-%{version}.db \
-    distrib/kilim.jar \
-    %{_libdir}/lib%{name}-%{version}.jar.so
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -75,23 +64,16 @@
 cp -pr doc/apis/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 (cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
 
-# solibs
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -m 755 distrib/lib*.jar.so $RPM_BUILD_ROOT%{_libdir}
-
-# gcjdb
-gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
-install -d -m 755 $RPM_BUILD_ROOT$gcjdbdir
-install -m 644 distrib/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
+aot-compile-rpm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %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}
@@ -105,8 +87,7 @@
 %files
 %defattr(0644,root,root,0755)
 %{_javadir}/*.jar
-%attr(0755,root,root) %{_libdir}/*.so
-%{_libdir}/*/*/*.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -115,6 +96,10 @@
 %ghost %dir %{_javadocdir}/%{name}
 
 %changelog
+* Fri Jul 29 2005 Gary Benson <gbenson at redhat.com> 0:1.1.3-2jpp_3fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm (also BC-compiles tools).
+
 * Mon Jun 27 2005 Gary Benson <gbenson at redhat.com> 0:1.1.3-2jpp_2fc
 - BC-compile the main jarfile.