rpms/jakarta-commons-el/devel jakarta-commons-el.spec,1.9,1.10

[fedora-cvs-commits at redhat.com]

Author: gbenson

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

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


Index: jakarta-commons-el.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-el/devel/jakarta-commons-el.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jakarta-commons-el.spec	26 May 2005 09:38:10 -0000	1.9
+++ jakarta-commons-el.spec	26 May 2005 09:55:03 -0000	1.10
@@ -68,10 +68,15 @@
   -Dj2se.javadoc=%{_javadocdir}/java \
   jar javadoc
 
+gcj-dbtool -n dist/%{name}-%{version}.db 512
 aot-compile \
     dist/%{short_name}.jar \
-    lib%{name}-%{version}.jar.so \
+    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
@@ -89,17 +94,14 @@
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 # solibs
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -m 755 lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+cp -p dist/lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}
 ln -sf lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.jar.so
 
 # gcjdb
 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}-%{version}.jar \
-  %{_libdir}/lib%{name}-%{version}.jar.so
+cp -p dist/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
 
 
 %clean
@@ -131,6 +133,9 @@
 
 
 %changelog
+* Thu May 26 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:1.0-2jpp_3fc
 - Add alpha to the list of build architectures (#157522).
 - Use absolute paths for rebuild-gcj-db.