From e9311ed3085402f862b5e55c97641af2fcefeaae Mon Sep 17 00:00:00 2001
From: gbenson <gbenson@fedoraproject.org>
Date: May 25 2005 16:35:29 +0000
Subject: Rearrange how BC-compiled stuff is built and installed


---

diff --git a/jakarta-commons-beanutils.spec b/jakarta-commons-beanutils.spec
index 408bbc8..73d6acd 100644
--- a/jakarta-commons-beanutils.spec
+++ b/jakarta-commons-beanutils.spec
@@ -45,7 +45,7 @@ Javadoc for %{name}.
 
 %prep
 rm -rf $RPM_BUILD_ROOT
-%setup -n %{short_name}-%{version}-src
+%setup -q -n %{short_name}-%{version}-src
 #cp LICENSE.txt LICENSE
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
@@ -54,10 +54,15 @@ find . -name "*.jar" -exec rm -f {} \;
 export CLASSPATH=%(build-classpath commons-collections commons-logging)
 ant -Dbuild.sysclasspath=first dist
 
+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
 # jars
@@ -72,15 +77,12 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 # solibs
 install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -m 755 lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}
+install -m 755 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
+install -d -m 755 $RPM_BUILD_ROOT$gcjdbdir
+install -m 644 dist/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -122,6 +124,9 @@ fi
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed May 25 2005 Gary Benson <gbenson@redhat.com>
+- Rearrange how BC-compiled stuff is built and installed.
+
 * Mon May 23 2005 Gary Benson <gbenson@redhat.com> - 0:1.7.0-1jpp_4fc
 - Add alpha to the list of build architectures (#157522).
 - Use absolute paths for rebuild-gcj-db.