rpms/mx4j/devel mx4j.spec,1.20,1.21

[fedora-cvs-commits at redhat.com]

Author: gbenson

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

Modified Files:
	mx4j.spec 
Log Message:
Rearrange how BC-compiled stuff is built and installed


Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mx4j.spec	27 May 2005 10:01:30 -0000	1.20
+++ mx4j.spec	27 May 2005 10:22:45 -0000	1.21
@@ -132,11 +132,15 @@
 ant compile.jmx compile.rjmx compile.tools javadocs docs
 cd ..
 
+gcj-dbtool -n dist/lib/%{name}-%{version}.db 512
 aot-compile \
     dist/lib/%{name}.jar \
-    dist/lib/lib%{name}.jar.so \
+    dist/lib/lib%{name}-%{version}.jar.so \
     "$RPM_OPT_FLAGS -fPIC"
-# also covers mx4j-jmx.jar and mx4j-impl.jar
+gcj-dbtool -f \
+    dist/lib/%{name}-%{version}.db \
+    dist/lib/%{name}.jar \
+    %{_libdir}/lib%{name}-%{version}.jar.so
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -164,16 +168,13 @@
 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)
+install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
+install -m 755 dist/lib/lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}
+ln -sf lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.jar.so
 
 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
+install -d -m 755 $RPM_BUILD_ROOT$gcjdbdir
+install -m 644 dist/lib/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -208,6 +209,9 @@
 %doc dist/docs/*
 
 %changelog
+* Fri May 27 2005 Gary Benson <gbenson at redhat.com>
+- Rearrange how BC-compiled stuff is built and installed.
+
 * Mon May 23 2005 Gary Benson <gbenson at redhat.com> 0:2.1.0-1jpp_8fc
 - Add alpha to the list of build architectures (#157522).
 - Use absolute paths for rebuild-gcj-db.