rpms/mx4j/devel mx4j.spec,1.31,1.32

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2746

Modified Files:
	mx4j.spec 
Log Message:
Build on ia64, ppc64, s390 and s390x


Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mx4j.spec	27 Jun 2005 13:13:01 -0000	1.31
+++ mx4j.spec	19 Jul 2005 15:54:55 -0000	1.32
@@ -1,6 +1,6 @@
 %define name        mx4j
 %define version     3.0.1
-%define release     1jpp_3fc
+%define release     1jpp_4fc
 %define section     free
 
 Name:           %{name}
@@ -40,7 +40,6 @@
 BuildRequires:  docbook-style-xsl >= 1.61
 BuildRequires:  xml-commons-resolver
 BuildRequires:  xml-commons
-BuildRequires:  jacorb
 BuildRequires:  jonathan-rmi
 Requires:       /usr/sbin/update-alternatives
 Requires:	jaf
@@ -58,10 +57,9 @@
 Obsoletes:      openjmx
 Provides:	jmxri
 # 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
 OpenJMX is an open source implementation of the
@@ -119,25 +117,12 @@
    log4j jaxp_transform_impl axis/axis axis/jaxrpc axis/saaj \
    xml-commons-resolver xdoclet/xdoclet xdoclet/xdoclet-jmx-module \
    xdoclet/xdoclet-mx4j-module)
-export CLASSPATH=$(build-classpath jacorb/jacorb jonathan-rmi):$CLASSPATH
+export CLASSPATH=$(build-classpath jonathan-rmi):$CLASSPATH
 
 export CLASSPATH=${CLASSPATH}:%{_builddir}/%{name}-%{version}/classes/core:%{_builddir}/%{name}-%{version}/build
 
 cd build
 ant compile.jmx compile.rjmx compile.tools javadocs docs
-cd ..
-
-gcj-dbtool -n dist/lib/%{name}-%{version}.db 1024
-for jar in %{name} %{name}-remote; do
-    aot-compile \
-        dist/lib/$jar.jar \
-        dist/lib/lib$jar-%{version}.jar.so \
-        "$RPM_OPT_FLAGS -fPIC"
-    gcj-dbtool -f \
-        dist/lib/%{name}-%{version}.db \
-        dist/lib/$jar.jar \
-        %{_libdir}/lib$jar-%{version}.jar.so
-done
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -163,14 +148,7 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -r dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
-# solibs
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -m 755 dist/lib/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 dist/lib/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
+aot-compile-rpm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -180,20 +158,19 @@
 
 %post
 /usr/sbin/update-alternatives --install %{_javadir}/jmxri.jar jmxri %{_javadir}/%{name}/%{name}-jmx.jar 0
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %postun
 if [ "$1" = "0" ]; then
 	/usr/sbin/update-alternatives --remove jmxri %{_javadir}/%{name}/%{name}-jmx.jar
 fi
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 
 %files
 %defattr(-,root,root)
 %{_javadir}/%{name}
-%attr(0755,root,root) %{_libdir}/*.so
-%{_libdir}/*/*/*.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files javadoc
 %defattr(-,root,root)
@@ -204,6 +181,11 @@
 %doc dist/docs/*
 
 %changelog
+* Tue Jul 19 2005 Gary Benson <gbenson at redhat.com> 0:3.0.1-1jpp_4fc
+- Build on ia64, ppc64, s390 and s390x.
+- Remove explicit references to jacorb.
+- Switch to aot-compile-rpm (also BC-compiles tools).
+
 * Mon Jun 27 2005 Gary Benson <gbenson at redhat.com> 0:3.0.1-1jpp_3fc
 - Also BC-compile the combined remote jarfile.