rpms/jakarta-commons-beanutils/devel jakarta-commons-beanutils.spec, 1.24, 1.25
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Jul 19 10:26:44 UTC 2005
Author: gbenson
Update of /cvs/dist/rpms/jakarta-commons-beanutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25326
Modified Files:
jakarta-commons-beanutils.spec
Log Message:
Build on ia64, ppc64, s390 and s390x
Index: jakarta-commons-beanutils.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-beanutils/devel/jakarta-commons-beanutils.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jakarta-commons-beanutils.spec 27 Jun 2005 13:13:01 -0000 1.24
+++ jakarta-commons-beanutils.spec 19 Jul 2005 10:26:41 -0000 1.25
@@ -2,7 +2,7 @@
%define short_name commons-%{base_name}
%define name jakarta-%{short_name}
%define version 1.7.0
-%define release 2jpp_1fc
+%define release 2jpp_2fc
%define section free
Name: %{name}
@@ -25,10 +25,9 @@
# RHEL3 and FC2
Obsoletes: %{short_name} <= 1.6.1
# 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 scope of this package is to create a package of Java utility methods
@@ -54,16 +53,6 @@
export CLASSPATH=%(build-classpath commons-collections commons-logging)
ant -Dbuild.sysclasspath=first dist
-gcj-dbtool -n dist/%{name}-%{version}.db 256
-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
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
@@ -75,13 +64,8 @@
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-# solibs
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -m 755 dist/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/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
+
+aot-compile-rpm
%clean
rm -rf $RPM_BUILD_ROOT
@@ -91,10 +75,10 @@
rm -f %{_javadir}/%{name}*.jar
%post
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
%postun
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
%triggerpostun -- commons-beanutils < 1.7
pushd %{_javadir} &> /dev/null
@@ -115,14 +99,17 @@
%defattr(0644,root,root,0755)
%doc PROPOSAL.html STATUS.html RELEASE-NOTES.txt LICENSE.txt
%{_javadir}/*
-%attr(0755,root,root) %{_libdir}/*.so
-%{_libdir}/*/*/*.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%changelog
+* Tue Jul 19 2005 Gary Benson <gbenson at redhat.com> - 0:1.7.0-2jpp_2fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm.
+
* Wed May 25 2005 Gary Benson <gbenson at redhat.com> - 0:1.7.0-2jpp_1fc
- Upgrade to 1.7.0-2jpp.
- Rearrange how BC-compiled stuff is built and installed.
More information about the fedora-cvs-commits
mailing list