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

[fedora-cvs-commits at redhat.com]

Author: gbenson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Jan 2005 14:50:20 -0000	1.4
+++ .cvsignore	4 May 2005 11:39:04 -0000	1.5
@@ -1,4 +1,4 @@
 commons-digester-1.6-src.tar.gz
 commons-digester-1.6-src
-noarch
+i386
 *.src.rpm


Index: jakarta-commons-digester.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jakarta-commons-digester.spec	20 Jan 2005 14:50:20 -0000	1.10
+++ jakarta-commons-digester.spec	4 May 2005 11:39:04 -0000	1.11
@@ -2,7 +2,7 @@
 %define short_name      commons-%{base_name}
 %define name            jakarta-%{short_name}
 %define version         1.6
-%define release         2jpp_1fc
+%define release         2jpp_2fc
 %define section         free
 
 Name:           %{name}
@@ -21,10 +21,11 @@
 BuildRequires:  jakarta-commons-collections >= 0:3.0
 BuildRequires:  jakarta-commons-logging >= 0:1.0
 BuildRequires:  jpackage-utils > 0:1.5
+BuildRequires:	gcc-java >= 4.0.0-0.43
 Requires:       jakarta-commons-beanutils >= 0:1.3
 Requires:       jakarta-commons-collections >= 0:3.0
 Requires:       jakarta-commons-logging >= 0:1.0
-BuildArch:      noarch
+ExclusiveArch:	i386 x86_64 ppc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 # RHEL3 and FC2
 Obsoletes:      %{short_name} <= 1.4.1
@@ -56,6 +57,11 @@
 
 rm ../LICENSE
 
+aot-compile \
+    dist/%{short_name}.jar \
+    lib%{name}-%{version}.jar.so \
+    "$RPM_OPT_FLAGS -fPIC"
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -70,6 +76,19 @@
 mkdir -p $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 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
 
@@ -77,6 +96,12 @@
 rm -f %{_javadir}/%{short_name}*.jar
 rm -f %{_javadir}/%{name}*.jar
 
+%post
+rebuild-gcj-db %{_libdir}
+
+%postun
+rebuild-gcj-db %{_libdir}
+
 %triggerpostun -- commons-digester < 1.5
 pushd %{_javadir} &> /dev/null
     ln -sf %{name}-%{version}.jar %{short_name}-%{version}.jar
@@ -96,12 +121,17 @@
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt PROPOSAL.html STATUS.html RELEASE-NOTES.txt
 %{_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:1.6-2jpp_2fc
+- BC-compile the main jarfile.
+
 * Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> - 0:1.6-2jpp_1fc
 - Build into Fedora.