rpms/mx4j/devel .cvsignore,1.6,1.7 mx4j.spec,1.10,1.11

[fedora-cvs-commits at redhat.com]

Author: gbenson

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

Modified Files:
	.cvsignore mx4j.spec 
Log Message:
BC-compile the combined jarfile


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	4 Mar 2005 15:39:31 -0000	1.6
+++ .cvsignore	25 Apr 2005 13:25:52 -0000	1.7
@@ -1,4 +1,4 @@
 mx4j-2.1.0-src.tar.gz
 mx4j-2.1.0
-noarch
+i386
 *.src.rpm


Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mx4j.spec	21 Apr 2005 16:56:10 -0000	1.10
+++ mx4j.spec	25 Apr 2005 13:25:52 -0000	1.11
@@ -63,7 +63,6 @@
 BuildRequires:  xml-commons-resolver
 BuildRequires:  xml-commons
 #BuildRequires:  xmlunit
-Buildarch:      noarch
 Requires:       /usr/sbin/update-alternatives
 Requires:	jaf
 Requires:	javamail >= 1.2-5jpp
@@ -174,9 +173,13 @@
 
 export CLASSPATH=${CLASSPATH}:%{_builddir}/%{name}-%{version}/classes/core:%{_builddir}/%{name}-%{version}/build
 
-cd build
+pushd build
 #ant -Dbuild.sysclasspath=first testreport javadocs docs
 ant compile.jmx compile.rjmx compile.tools javadocs docs
+popd
+
+aot-compile dist/lib/%{name}.jar dist/lib/lib%{name}.jar.so
+# also covers mx4j-jmx.jar and mx4j-impl.jar
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -202,6 +205,17 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -r dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+cp -p dist/lib/lib%{name}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}-%{version}.jar.so
+(cd $RPM_BUILD_ROOT%{_libdir} && for so in lib*-%{version}.jar.so; do ln -sf ${so} `echo $so| sed "s|-%{version}||g"`; done)
+
+gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
+mkdir -p $RPM_BUILD_ROOT$gcjdbdir
+gcj-dbtool -n $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db 80000
+gcj-dbtool -f $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db \
+  $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-%{version}.jar \
+  %{_libdir}/lib%{name}-%{version}.jar.so
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -210,11 +224,13 @@
 
 %post
 /usr/sbin/update-alternatives --install %{_javadir}/jmxri.jar jmxri %{_javadir}/%{name}/%{name}-jmx.jar 0
+rebuild-gcj-db %{_libdir}
 
 %postun
 if [ "$1" = "0" ]; then
 	/usr/sbin/update-alternatives --remove jmxri %{_javadir}/%{name}/%{name}-jmx.jar
 fi
+rebuild-gcj-db %{_libdir}
 
 
 %files
@@ -222,6 +238,8 @@
 %dir %{_javadir}/%{name}
 %{_javadir}/%{name}/*.jar
 %{_javadir}/%{name}/boa/*.jar
+%attr(0755,root,root) %{_libdir}/lib*.jar.so
+%{_libdir}/*/*/%{name}-%{version}.db
 
 %files javadoc
 %defattr(-,root,root)
@@ -232,6 +250,9 @@
 %doc dist/docs/*
 
 %changelog
+* Mon Apr 25 2005 Gary Benson <gbenson at redhat.com>
+- BC-compile the combined jarfile.
+
 * Thu Apr 21 2005 Gary Benson <gbenson at redhat.com> 0:2.1.0-1jpp_4fc
 - Revert previous two changes.