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

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/javacc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7789

Modified Files:
	javacc.spec 
Log Message:
Build on ia64, ppc64, s390 and s390x


Index: javacc.spec
===================================================================
RCS file: /cvs/dist/rpms/javacc/devel/javacc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- javacc.spec	5 Jul 2005 15:35:51 -0000	1.9
+++ javacc.spec	19 Jul 2005 16:57:57 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           javacc
 Version:        3.2
-Release:        1jpp_2fc
+Release:        1jpp_3fc
 Epoch:          0
 Summary:        A parser/scanner generator for java
 License:        BSD
@@ -16,10 +16,9 @@
 Requires:	jpackage-utils >= 0:1.5
 BuildRequires:	ant, /bin/bash
 # 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 
 Java Compiler Compiler (JavaCC) is the most popular parser generator for use
@@ -55,16 +54,6 @@
   -Dversion=%{version} \
   jar
 
-gcj-dbtool -n bin/lib/%{name}-%{version}.db 256
-aot-compile \
-    bin/lib/%{name}.jar \
-    bin/lib/lib%{name}-%{version}.jar.so \
-    "$RPM_OPT_FLAGS -fPIC"
-gcj-dbtool -f \
-    bin/lib/%{name}-%{version}.db \
-    bin/lib/%{name}.jar \
-    %{_libdir}/lib%{name}-%{version}.jar.so
-
 %install
 rm -fr $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
@@ -75,28 +64,23 @@
 install -d -m 755 $RPM_BUILD_ROOT/usr/share/%{name}
 cp -pr examples $RPM_BUILD_ROOT/usr/share/%{name}
 
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -m 755 bin/lib/lib*.jar.so $RPM_BUILD_ROOT%{_libdir}
-gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
-install -d -m 755 $RPM_BUILD_ROOT$gcjdbdir
-install -m 644 bin/lib/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
+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
 
 %files
 %defattr(0644,root,root,0755)
 %{_javadir}/*.jar
 %doc LICENSE README
 %attr(0755,root,root) /usr/bin/*
-%attr(0755,root,root) %{_libdir}/*.so
-%{_libdir}/*/*/*.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files manual
 %defattr(0644,root,root,0755)
@@ -107,6 +91,10 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Tue Jul 19 2005 Gary Benson <gbenson at redhat.com> 0:3.2-1jpp_3fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm.
+
 * Tue Jul 05 2005 Andrew Overholt <overholt at redhat.com> 0:3.2-1jpp_2fc
 - Bump release for FC4 update.