rpms/nanoxml/devel nanoxml.spec,1.9,1.10

[fedora-cvs-commits redhat com]

Author: gbenson

Update of /cvs/dist/rpms/nanoxml/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26673

Modified Files:
	nanoxml.spec 
Log Message:
Convert to aot-compile-rpm


Index: nanoxml.spec
===================================================================
RCS file: /cvs/dist/rpms/nanoxml/devel/nanoxml.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nanoxml.spec	5 Jul 2005 08:28:03 -0000	1.9
+++ nanoxml.spec	28 Jul 2005 13:35:36 -0000	1.10
@@ -15,10 +15,9 @@
 Group:          Text Processing/Markup/XML
 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
 The intent of NanoXML is to be a small parser which is easy to use.
@@ -63,16 +62,6 @@
 %build
 sh ./build.sh
 
-gcj-dbtool -n Output/%{name}-lite-%{version}.db 64
-aot-compile \
-    Output/%{name}-lite.jar \
-    Output/lib%{name}-lite-%{version}.jar.so \
-    "$RPM_OPT_FLAGS -fPIC"
-gcj-dbtool -f \
-    Output/%{name}-lite-%{version}.db \
-    Output/%{name}-lite.jar \
-    %{_libdir}/lib%{name}-lite-%{version}.jar.so
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -92,26 +81,26 @@
 cp -pr Documentation/JavaDoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
-# solibs
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -m 755 Output/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/%{name}-lite-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
-
+aot-compile-rpm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+%{_bindir}/rebuild-gcj-db
+
+
+%postun
+%{_bindir}/rebuild-gcj-db
+
+
 %post lite
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 
 %postun lite
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 
 %post javadoc
@@ -125,13 +114,16 @@
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-sax-%{version}.jar
 %{_javadir}/%{name}-sax.jar
+%dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-sax-%{version}.jar.*
 
 %files lite
 %defattr(-,root,root,-)
 %{_javadir}/%{name}-lite-%{version}.jar
 %{_javadir}/%{name}-lite.jar
-%attr(0755,root,root) %{_libdir}/*.so
-%{_libdir}/*/*/%{name}-lite-%{version}.db
+%dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-lite-%{version}.jar.*
 
 %files manual
 %defattr(0644,root,root,0755)
@@ -148,8 +140,8 @@
 
 
 %changelog
-* Tue Jul  5 2005 Gary Benson <gbenson redhat com> - 0:2.2.3-3jpp_3fc
-- BC-compile the lite jarfile.
+* Thu Jul 28 2005 Gary Benson <gbenson redhat com> - 0:2.2.3-3jpp_3fc
+- BC-compile.
 
 * Wed Jun 22 2005 Gary Benson <gbenson redhat com> - 0:2.2.3-3jpp_2fc
 - Remove jarfile from the tarball.