rpms/p6spy/devel p6spy.spec,1.5,1.6

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/p6spy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27846

Modified Files:
	p6spy.spec 
Log Message:
Switch to aot-compile-rpm and build on ia64, ppc64, s390 and s390x


Index: p6spy.spec
===================================================================
RCS file: /cvs/dist/rpms/p6spy/devel/p6spy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- p6spy.spec	28 Jun 2005 14:03:43 -0000	1.5
+++ p6spy.spec	29 Jul 2005 09:28:55 -0000	1.6
@@ -4,7 +4,7 @@
 Summary:        Database statement interceptor for Java
 Name:           p6spy
 Version:        1.3
-Release:        2jpp_2fc
+Release:        2jpp_3fc
 Epoch:          0
 Group:          Database
 License:        P6Spy Software License
@@ -25,10 +25,9 @@
 Requires:       log4j
 Requires:       jdbc-stdext
 # libgcj aot-compiled native libraries
-BuildRequires:         gcc-java >= 4.0.0-0.43
-BuildRequires:         java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
-Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
-ExclusiveArch:         %{ix86} x86_64 ppc alpha
+BuildRequires:    java-gcj-compat-devel >= 1.0.31
+Requires(post):   java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
 
 %description
 P6Spy is an open source framework for applications that intercept and
@@ -66,16 +65,6 @@
   -Dj2se.javadoc=%{_javadocdir}/java \
   clean release
 
-gcj-dbtool -n dist/%{name}-%{version}.db 128
-aot-compile \
-    dist/%{name}.jar \
-    dist/lib%{name}-%{version}.jar.so \
-    "$RPM_OPT_FLAGS -fPIC"
-gcj-dbtool -f \
-    dist/%{name}-%{version}.db \
-    dist/%{name}.jar \
-    %{_libdir}/lib%{name}-%{version}.jar.so
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -85,15 +74,6 @@
 cp -p dist/p6spy.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
-# solibs
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -m 755 dist/lib*.jar.so $RPM_BUILD_ROOT%{_libdir}
-
-# gcjdb
-gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
-install -d -m 755 $RPM_BUILD_ROOT$gcjdbdir
-install -m 644 dist/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
-
 # javadocs
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -103,17 +83,19 @@
 # TODO: dist/p6spy.war to tomcat/jboss+jetty webapps dir
 # TODO: make %{_javadir}/p6spy.jar available in tomcat/jboss+jetty classpath
 
+aot-compile-rpm
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %post
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 
 %postun
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 
 %post javadoc
@@ -125,8 +107,7 @@
 %defattr(0644,root,root,0755)
 %doc license.txt spy.properties
 %{_javadir}/*.jar
-%attr(0755,root,root) %{_libdir}/lib*.jar.so
-%{_libdir}/*/*/%{name}-%{version}.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -139,6 +120,10 @@
 
 
 %changelog
+* Fri Jul 29 2005 Gary Benson <gbenson at redhat.com> 0:1.3-2jpp_3fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm.
+
 * Tue Jun 28 2005 Gary Benson <gbenson at redhat.com> 0:1.3-2jpp_2fc
 - BC-compile.