rpms/db4/devel db4.spec,1.20,1.21

[fedora-cvs-commits redhat com]

Author: pnasrat

Update of /cvs/dist/rpms/db4/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15922

Modified Files:
	db4.spec 
Log Message:
 re-enable java


Index: db4.spec
===================================================================
RCS file: /cvs/dist/rpms/db4/devel/db4.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- db4.spec	17 May 2005 17:51:54 -0000	1.20
+++ db4.spec	14 Jul 2005 15:36:31 -0000	1.21
@@ -1,11 +1,9 @@
 # the set of arches on which libgcj provides gcj and libgcj-javac-placeholder.sh
 %define java_arches %{ix86} alpha ia64 ppc ppc64 s390 s390x sparc sparcv9 x86_64
-%undefine java_arches
 # borrow the definition of nptl_arches from glibc's .spec file
 %define nptl_arches %{ix86}       ia64 ppc ppc64 s390 s390x       sparcv9 x86_64
 # define nptl_java_arches to be the intersection of java_arches and nptl_arches
 %define nptl_java_arches %{ix86}  ia64 ppc ppc64 s390 s390x       sparcv9 x86_64
-%undefine nptl_java_arches
 
 # compatibility with legacy versions of rpm
 %{!?_lib:%define _lib	lib}
@@ -17,7 +15,7 @@
 Summary: The Berkeley DB database library (version 4) for C.
 Name: db4
 Version: 4.3.27
-Release: 4
+Release: 5
 Source: http://www.sleepycat.com/update/%{version}/db-%{version}.tar.gz
 Source1: http://www.sleepycat.com/update/1.85/db.1.85.tar.gz
 Source2: nptl-abi-note.S
@@ -35,6 +33,7 @@
 BuildPreReq: perl, libtool, ed, tcl-devel >= 8.4.4
 %ifarch %{java_arches}
 BuildPreReq: gcc-java
+BuildPreReq: java-1.4.2-gcj-compat
 %endif
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -242,8 +241,12 @@
 %ifarch %{nptl_arches}
 %makeinstall -C dist/dist-tls
 
-# XXX Nuke non-versioned archives.
+# XXX Nuke non-versioned archives and symlinks
 rm -f $RPM_BUILD_ROOT/%{_libdir}/{libdb.a,libdb_cxx.a}
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libdb-4.so
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libdb_cxx-4.so
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libdb_tcl-4.so
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libdb_tcl.so
 
 chmod +x $RPM_BUILD_ROOT/%{_libdir}/*.so*
 mkdir -p ${RPM_BUILD_ROOT}{/%{_lib},%{_libdir}}/tls
@@ -426,6 +429,9 @@
 %endif
 
 %changelog
+* Thu Jul 14 2005 Paul Nasrat <pnasrat redhat com> 4.3.27-5
+- re-enable db4-java
+
 * Tue May 17 2005 Paul Nasrat <pnasrat redhat com> 4.3.27-4
 - /usr/lib/tls/ix86 dirs (#151371)