rpms/jakarta-commons-beanutils/devel jakarta-commons-beanutils.spec, 1.17, 1.18

[fedora-cvs-commits at redhat.com]

Author: gbenson

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

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


Index: jakarta-commons-beanutils.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-beanutils/devel/jakarta-commons-beanutils.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jakarta-commons-beanutils.spec	25 May 2005 16:13:45 -0000	1.17
+++ jakarta-commons-beanutils.spec	25 May 2005 16:35:29 -0000	1.18
@@ -45,7 +45,7 @@
 
 %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 @@
 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 @@
 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 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed May 25 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.7.0-1jpp_4fc
 - Add alpha to the list of build architectures (#157522).
 - Use absolute paths for rebuild-gcj-db.