rpms/jakarta-commons-collections/devel .cvsignore, 1.4, 1.5 jakarta-commons-collections.spec, 1.10, 1.11

[fedora-cvs-commits at redhat.com]

Author: gbenson

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

Modified Files:
	.cvsignore jakarta-commons-collections.spec 
Log Message:
BC-compile


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Jan 2005 12:46:41 -0000	1.4
+++ .cvsignore	4 May 2005 12:40:58 -0000	1.5
@@ -1,4 +1,4 @@
 commons-collections-3.1-src.tar.gz
 commons-collections-3.1
-noarch
+i386
 *.src.rpm


Index: jakarta-commons-collections.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/jakarta-commons-collections.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jakarta-commons-collections.spec	20 Jan 2005 12:58:39 -0000	1.10
+++ jakarta-commons-collections.spec	4 May 2005 12:40:58 -0000	1.11
@@ -2,7 +2,7 @@
 %define short_name	commons-%{base_name}
 %define name		jakarta-%{short_name}
 %define version		3.1
-%define release		1jpp_1fc
+%define release		1jpp_2fc
 %define	section		free
 %define with_tests %{?_with_tests:1}%{!?_without_tests:0}
 
@@ -21,8 +21,8 @@
 BuildRequires:	ant-junit
 BuildRequires:	jpackage-utils >= 0:1.5
 BuildRequires:  coreutils
-
-BuildArch:	noarch
+BuildRequires:	gcc-java >= 4.0.0-0.43
+ExclusiveArch:	i386 x86_64 ppc
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 # RHEL3 and FC2
 Obsoletes:	%{short_name} <= 0:2.1
@@ -61,6 +61,11 @@
 ant -Djava.io.tmpdir=. test
 %endif
 
+aot-compile \
+    build/%{short_name}-%{version}.jar \
+    lib%{name}-%{version}.jar.so \
+    "$RPM_OPT_FLAGS -fPIC"
+
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
@@ -70,6 +75,17 @@
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr build/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+# solibs
+install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
+install -m 755 lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}
+ln -sf lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.jar.so
+# gcjdb
+gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
+mkdir -p $RPM_BUILD_ROOT$gcjdbdir
+gcj-dbtool -n $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db 80000
+gcj-dbtool -f $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db \
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar \
+  %{_libdir}/lib%{name}-%{version}.jar.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,6 +95,12 @@
 rm -f %{_javadir}/%{short_name}*.jar
 rm -f %{_javadir}/%{name}*.jar
 
+%post
+rebuild-gcj-db %{_libdir}
+
+%postun
+rebuild-gcj-db %{_libdir}
+
 %triggerpostun -- commons-collections < 3.0
 pushd %{_javadir} &> /dev/null
     ln -sf %{name}-%{version}.jar %{short_name}-%{version}.jar
@@ -98,12 +120,17 @@
 %defattr(0644,root,root,0755)
 %doc PROPOSAL.html README.txt STATUS.html LICENSE.txt RELEASE-NOTES.html
 %{_javadir}/*
+%attr(0755,root,root) %{_libdir}/lib*.jar.so
+%{_libdir}/*/*/%{name}-%{version}.db
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed May  4 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-1jpp_2fc
+- BC-compile.
+
 * Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-1jpp_1fc
 - Build into Fedora.