From a95aada476ea3d5b522d66e4fd852b90c17548c5 Mon Sep 17 00:00:00 2001
From: gbenson <gbenson@fedoraproject.org>
Date: Tue, 19 Jul 2005 10:59:27 +0000
Subject: [PATCH] Build on ia64, ppc64, s390 and s390x

---
 java_cup.spec | 43 +++++++++++++------------------------------
 1 file changed, 13 insertions(+), 30 deletions(-)

diff --git a/java_cup.spec b/java_cup.spec
index 3794af0..95ff4cb 100644
--- a/java_cup.spec
+++ b/java_cup.spec
@@ -1,7 +1,7 @@
 %define name		java_cup
 %define version		0.10
 %define pkg_version	v10k
-%define release		0.k.1jpp_4fc
+%define release		0.k.1jpp_5fc
 %define section		free
 
 Name:		%{name}
@@ -20,10 +20,9 @@ Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
 # RHEL3 and FC2
 Obsoletes:	cup <= 0:v10k
 # 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_cup is a LALR Parser Generator for Java
@@ -53,18 +52,6 @@ find . -name "*.class" -exec rm -f {} \;
 ant
 ant javadoc
 
-gcj-dbtool -n dist/lib/%{name}-%{version}.db 64
-for jar in %{name} %{name}-runtime; do
-    aot-compile \
-        dist/lib/$jar.jar \
-        dist/lib/lib$jar-%{version}.jar.so \
-        "$RPM_OPT_FLAGS -fPIC"
-    gcj-dbtool -f \
-        dist/lib/%{name}-%{version}.db \
-        dist/lib/$jar.jar \
-        %{_libdir}/lib$jar-%{version}.jar.so
-done
-
 %install
 # jar
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
@@ -73,28 +60,21 @@ install -m 644 dist/lib/%{name}-runtime.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-r
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \
 ln -sf ${jar} ${jar/-%{version}/}; done)
 
-# solibs
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -m 755 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 dist/lib/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
-
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/javadoc/* $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}
@@ -109,8 +89,7 @@ fi
 %defattr(0644,root,root,0755)
 %doc README LICENSE CHANGELOG
 %{_javadir}/*
-%attr(0755,root,root) %{_libdir}/lib*.jar.so
-%{_libdir}/*/*/%{name}-%{version}.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files manual
 %defattr(0644,root,root,0755)
@@ -122,6 +101,10 @@ fi
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue Jul 19 2005 Gary Benson <gbenson@redhat.com> 1:0.10-0.k.1jpp_5fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm.
+
 * Tue Jun 28 2005 Gary Benson <gbenson@redhat.com> 1:0.10-0.k.1jpp_4fc
 - BC-compile.