rpms/jakarta-commons-logging/devel .cvsignore, 1.4, 1.5 jakarta-commons-logging.spec, 1.11, 1.12

[fedora-cvs-commits at redhat.com]

Author: gbenson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-logging/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Oct 2004 13:55:30 -0000	1.4
+++ .cvsignore	4 May 2005 13:24:27 -0000	1.5
@@ -1,4 +1,4 @@
 commons-logging-1.0.4-src.tar.gz
 commons-logging-1.0.4-src
-noarch
+i386
 *.src.rpm


Index: jakarta-commons-logging.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-logging/devel/jakarta-commons-logging.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jakarta-commons-logging.spec	11 Jan 2005 17:59:08 -0000	1.11
+++ jakarta-commons-logging.spec	4 May 2005 13:24:27 -0000	1.12
@@ -6,7 +6,7 @@
 
 Name:           %{name}
 Version:        1.0.4
-Release:        2jpp_1fc
+Release:        2jpp_2fc
 Epoch:          0
 Summary:        Jakarta Commons Logging Package
 License:        Apache Software License
@@ -17,8 +17,9 @@
 Source0:        http://www.apache.org/dist/jakarta/commons/logging/source/commons-logging-1.0.4-src.tar.gz
 BuildRequires:  ant, jpackage-utils >= 0:1.5, log4j, avalon-logkit, avalon-framework, junit
 BuildRequires:  coreutils
+BuildRequires:	gcc-java >= 4.0.0-0.43
 Patch1:         %{name}-junitclasspath.patch
-BuildArch:      noarch
+ExclusiveArch:	i386 x86_64 ppc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 # RHEL3 and FC2
 Obsoletes:      %{short_name} <= 0:1.0.2
@@ -64,6 +65,12 @@
 ant test
 %endif
 
+aot-compile \
+    dist/%{short_name}.jar \
+    lib%{name}-%{version}.jar.so \
+    "$RPM_OPT_FLAGS -fPIC"
+# also covers %{short_name}-api.jar
+
 # -----------------------------------------------------------------------------
 
 %install
@@ -78,6 +85,17 @@
 # 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 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
 
 # -----------------------------------------------------------------------------
 
@@ -90,6 +108,12 @@
 rm -f %{_javadir}/%{short_name}*.jar
 rm -f %{_javadir}/%{name}*.jar
 
+%post
+rebuild-gcj-db %{_libdir}
+
+%postun
+rebuild-gcj-db %{_libdir}
+
 %triggerpostun -- commons-logging < 1.1
 pushd %{_javadir} &> /dev/null
     ln -sf %{name}-%{version}.jar %{short_name}-%{version}.jar
@@ -113,6 +137,8 @@
 %defattr(0644,root,root,0755)
 %doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt
 %{_javadir}/*
+%attr(0755,root,root) %{_libdir}/lib*.jar.so
+%{_libdir}/*/*/%{name}-%{version}.db
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -121,10 +147,13 @@
 # -----------------------------------------------------------------------------
 
 %changelog
-* Tue Jan 11 2005 Gary Benson <gbenson at redhat.com> 0:1.0.4-2jpp_1fc
+* Wed May  4 2005 Gary Benson <gbenson at redhat.com> - 0:1.0.4-2jpp_2fc
+- BC-compile.
+
+* Tue Jan 11 2005 Gary Benson <gbenson at redhat.com> - 0:1.0.4-2jpp_1fc
 - Sync with RHAPS.
 
-* Thu Nov  4 2004 Gary Benson <gbenson at redhat.com> 0:1.0.4-1jpp_2fc
+* Thu Nov  4 2004 Gary Benson <gbenson at redhat.com> - 0:1.0.4-1jpp_2fc
 - Build into Fedora.
 
 * Thu Oct 21 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.0.4-2jpp_1rh