rpms/jakarta-commons-modeler/devel jakarta-commons-modeler.spec, 1.23, 1.24

[fedora-cvs-commits redhat com]

Author: gbenson

Update of /cvs/dist/rpms/jakarta-commons-modeler/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4166

Modified Files:
	jakarta-commons-modeler.spec 
Log Message:
Build on ia64, ppc64, s390 and s390x


Index: jakarta-commons-modeler.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jakarta-commons-modeler.spec	27 Jun 2005 13:13:01 -0000	1.23
+++ jakarta-commons-modeler.spec	20 Jul 2005 08:48:57 -0000	1.24
@@ -2,7 +2,7 @@
 %define short_name	commons-%{base_name}
 %define name		jakarta-%{short_name}
 %define version		1.1
-%define release		4jpp_1fc
+%define release		4jpp_2fc
 %define	section		free
 
 Name:		%{name}
@@ -36,10 +36,9 @@
 # RHEL3 and FC2
 Obsoletes:	%{short_name} <= 0:1.0
 # 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 Modeler project shall create and maintain a set of Java
@@ -63,16 +62,6 @@
 export CLASSPATH=$(build-classpath xml-commons-apis jaxp_parser_impl jaxp_transform_impl jmxri junit commons-beanutils commons-collections commons-digester commons-logging)
 %ant dist
 
-gcj-dbtool -n dist/%{name}-%{version}.db 128
-aot-compile \
-    dist/%{short_name}.jar \
-    dist/lib%{name}-%{version}.jar.so \
-    "$RPM_OPT_FLAGS -fPIC"
-gcj-dbtool -f \
-    dist/%{name}-%{version}.db \
-    dist/%{short_name}.jar \
-    %{_libdir}/lib%{name}-%{version}.jar.so
-
 %install
 # jars
 %__mkdir_p %{buildroot}%{_javadir}
@@ -83,13 +72,8 @@
 %__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
 %__cp -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
 (cd %{buildroot}%{_javadocdir} && %__ln_s %{name}-%{version} %{name})
-# solibs
-%__mkdir_p %{buildroot}%{_libdir}
-%__cp -a dist/lib*.jar.so %{buildroot}%{_libdir}
-# gcjdb
-gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
-%__mkdir -p %{buildroot}$gcjdbdir
-%__cp -a dist/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
+
+aot-compile-rpm
 
 %clean
 %__rm -rf %{buildroot}
@@ -105,10 +89,10 @@
 popd &> /dev/null
 
 %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}
@@ -123,8 +107,7 @@
 %defattr(0644,root,root,0755)
 %doc STATUS.html RELEASE-NOTES.txt PROPOSAL.html
 %{_javadir}/*
-%attr(0755,root,root) %{_libdir}/*.so
-%{_libdir}/*/*/*.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -133,6 +116,10 @@
 %ghost %dir %{_javadocdir}/%{name}
 
 %changelog
+* Wed Jul 20 2005 Gary Benson <gbenson redhat com> - 0:1.1-4jpp_2fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm.
+
 * Thu May 26 2005 Gary Benson <gbenson redhat com> - 0:1.1-4jpp_1fc
 - Upgrade to 1.1-4jpp.
 - Rearrange how BC-compiled stuff is built and installed.