rpms/monolog/devel monolog.spec,1.12,1.13

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/monolog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21381

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


Index: monolog.spec
===================================================================
RCS file: /cvs/dist/rpms/monolog/devel/monolog.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- monolog.spec	29 Jun 2005 15:06:59 -0000	1.12
+++ monolog.spec	1 Aug 2005 09:28:11 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:		monolog
 Version:	1.8.6
-Release:	1jpp_4fc
+Release:	1jpp_5fc
 Epoch:		0
 Summary:	API for monitoring and logging
 License:	LGPL
@@ -21,10 +21,9 @@
 BuildRequires:	junit
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 # 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
 Monolog is an API of monitoring and logging.
@@ -56,16 +55,6 @@
 popd
 ant jar jdoc
 
-gcj-dbtool -n output/dist/lib/%{name}-%{version}.db 128
-aot-compile \
-    output/dist/lib/ow_%{name}.jar \
-    output/dist/lib/libow_%{name}-%{version}.jar.so \
-    "$RPM_OPT_FLAGS -fPIC"
-gcj-dbtool -f \
-    output/dist/lib/%{name}-%{version}.db \
-    output/dist/lib/ow_%{name}.jar \
-    %{_libdir}/libow_%{name}-%{version}.jar.so
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -83,28 +72,21 @@
 (cd $RPM_BUILD_ROOT%{_javadir}//%{name} && for jar in *-%{version}*; do \
 ln -sf ${jar} ${jar/-%{version}/}; done)
 
-# solibs
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -m 755 output/dist/lib/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 output/dist/lib/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
-
 # javadoc
 install -p -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr output/dist/jdoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 (cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
 
+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
 rm -f %{_javadocdir}/%{name}
@@ -119,8 +101,7 @@
 %defattr(0644,root,root,0755)
 %dir %{_javadir}/%{name}
 %{_javadir}/%{name}/*.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)
@@ -129,6 +110,10 @@
 %ghost %dir %{_javadocdir}/%{name}
 
 %changelog
+* Mon Aug  1 2005 Gary Benson <gbenson at redhat.com> 0:1.8.6-1jpp_5fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm.
+
 * Wed Jun 29 2005 Gary Benson <gbenson at redhat.com> 0:1.8.6-1jpp_4fc
 - Also build ow_util_io.jar, as required by medor.