rpms/regexp/devel .cvsignore,1.3,1.4 regexp.spec,1.10,1.11

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/regexp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4342

Modified Files:
	.cvsignore regexp.spec 
Log Message:
BC-compile


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/regexp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Oct 2004 13:55:30 -0000	1.3
+++ .cvsignore	5 May 2005 13:19:04 -0000	1.4
@@ -1,5 +1,5 @@
 jakarta-regexp-1.3.tar.gz
 jakarta-regexp-1.3
-noarch
+i386
 *.src.rpm
 


Index: regexp.spec
===================================================================
RCS file: /cvs/dist/rpms/regexp/devel/regexp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- regexp.spec	11 Jan 2005 15:00:42 -0000	1.10
+++ regexp.spec	5 May 2005 13:19:04 -0000	1.11
@@ -1,7 +1,7 @@
 %define name		regexp
 %define full_name	jakarta-%{name}
 %define version		1.3
-%define release		1jpp_4fc
+%define release		1jpp_5fc
 %define section		free
 
 Name:           %{name}
@@ -11,17 +11,19 @@
 Summary:        Simple regular expressions API
 License:        Apache Software License
 Group:          Development/Libraries/Java
-#Distribution:   JPackage
-#Vendor:         JPackage Project
 Url:            http://jakarta.apache.org/%{name}/
 Source0:        http://www.apache.org/dist/jakarta/regexp/jakarta-regexp-%{version}.tar.gz
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.5
 BuildRequires:  coreutils
-Buildarch:      noarch
 Buildroot:      %{_tmppath}/%{name}-%{version}-buildroot
 # RHEL3 and FC2
 Obsoletes:	%{full_name} <= 0:1.2
+# 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
 
 %description
 Regexp is a 100% Pure Java Regular Expression package that was
@@ -48,6 +50,11 @@
 mkdir lib
 ant -Djakarta-site2.dir=. jar javadocs
 
+aot-compile \
+    build/%{full_name}-%{version}.jar \
+    lib%{name}-%{version}.jar.so \
+    "$RPM_OPT_FLAGS -fPIC"
+
 
 %install
 # jars
@@ -58,6 +65,17 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -r docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 rm -rf docs/api
+# 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
@@ -66,6 +84,12 @@
 rm -f %{_javadir}/%{full_name}.jar
 rm -f %{_javadir}/%{name}.jar
 
+%post
+rebuild-gcj-db %{_libdir}
+
+%postun
+rebuild-gcj-db %{_libdir}
+
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
@@ -79,12 +103,17 @@
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt
 %{_javadir}/*.jar
+%attr(0755,root,root) %{_libdir}/lib*.jar.so
+%{_libdir}/*/*/%{name}-%{version}.db
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Thu May  5 2005 Gary Benson <gbenson at redhat.com> 0:1.3-1jpp_5fc
+- BC-compile.
+
 * Tue Jan 11 2005 Gary Benson <gbenson at redhat.com> 0:1.3-1jpp_4fc
 - Sync with RHAPS.