rpms/jakarta-commons-modeler/devel .cvsignore, 1.3, 1.4 jakarta-commons-modeler.spec, 1.8, 1.9

[fedora-cvs-commits at redhat.com]

Author: gbenson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Mar 2005 15:55:16 -0000	1.3
+++ .cvsignore	4 May 2005 11:15:39 -0000	1.4
@@ -1,4 +1,4 @@
 modeler-1.1-src.tar.gz
 commons-modeler-1.1-src
-noarch
+i386
 *.src.rpm


Index: jakarta-commons-modeler.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jakarta-commons-modeler.spec	7 Mar 2005 14:28:54 -0000	1.8
+++ jakarta-commons-modeler.spec	4 May 2005 11:15:39 -0000	1.9
@@ -2,7 +2,7 @@
 %define short_name	commons-%{base_name}
 %define name		jakarta-%{short_name}
 %define version		1.1
-%define release		3jpp_1fc
+%define release		3jpp_2fc
 %define	section		free
 
 Name:		%{name}
@@ -27,6 +27,7 @@
 BuildRequires:	jakarta-commons-collections >= 2.0
 BuildRequires:	jakarta-commons-digester >= 1.2
 BuildRequires:	jakarta-commons-logging >= 1.0
+BuildRequires:	gcc-java >= 4.0.0-0.43
 Requires:	jaxp_parser_impl
 Requires:	xml-commons-apis
 Requires:	jaxp_transform_impl
@@ -35,7 +36,7 @@
 Requires:	jakarta-commons-collections >= 2.0
 Requires:	jakarta-commons-digester >= 1.2
 Requires:	jakarta-commons-logging >= 1.0
-BuildArch:	noarch
+ExclusiveArch:	i386 x86_64 ppc
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 Provides:	%{short_name}
 Obsoletes:	%{short_name}
@@ -66,6 +67,11 @@
 
 ant dist
 
+aot-compile \
+    dist/%{short_name}.jar \
+    lib%{name}-%{version}.jar.so \
+    "$RPM_OPT_FLAGS -fPIC"
+
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
@@ -75,6 +81,17 @@
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/* $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
@@ -89,17 +106,28 @@
     ln -sf %{short_name}-%{version}.jar %{short_name}.jar
 popd &> /dev/null
 
+%post
+rebuild-gcj-db %{_libdir}
+
+%postun
+rebuild-gcj-db %{_libdir}
+
 %files
 %defattr(-,root,root)
 %doc STATUS.html RELEASE-NOTES.txt PROPOSAL.html
 %{_javadir}/*
+%attr(0755,root,root) %{_libdir}/lib*.jar.so
+%{_libdir}/*/*/%{name}-%{version}.db
 
 %files javadoc
 %defattr(-,root,root)
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
-* Mon Mar  7 2005 Gary Benson <gbenson at redhat.com> 0:1.1-3jpp_1fc
+* Wed May  4 2005 Gary Benson <gbenson at redhat.com> - 0:1.1-3jpp_2fc
+- BC-compile.
+
+* Mon Mar  7 2005 Gary Benson <gbenson at redhat.com> - 0:1.1-3jpp_1fc
 - Build into Fedora.
 
 * Fri Oct 22 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.1-3jpp_1rh