rpms/db4/devel db-4.3.29-lfs.patch,NONE,1.1 db4.spec,1.30,1.31

Wed Feb 15 11:06:33 UTC 2006

Author: jnovy

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

Modified Files:
	db4.spec 
Added Files:
	db-4.3.29-lfs.patch 
Log Message:
* Wed Feb 15 2006 Jindrich Novy <jnovy at redhat.com> 4.3.29-2
- don't package /usr/share/doc/images in the main db4 package
  and move it to db4-devel (#33328)
- make db4 LFS capable (#33849)
- move db4-devel, db4-tcl, db4-java to Development/Libraries
  group instead of System Environment/Libraries (#54320)
- BuildPrereq -> BuildRequires
- don't use RPM_SOURCE_DIR
- Obsoletes db3, db2


db-4.3.29-lfs.patch:
 os_config.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE db-4.3.29-lfs.patch ---
--- db-4.3.29/os/os_config.c.lfs	2004-01-28 04:36:18.000000000 +0100
+++ db-4.3.29/os/os_config.c	2006-02-15 11:11:06.000000000 +0100
@@ -11,6 +11,7 @@
 
 #ifndef NO_SYSTEM_INCLUDES
 #include <sys/types.h>
+#include <fcntl.h>
 #endif
 
 #include "db_int.h"


Index: db4.spec
===================================================================
RCS file: /cvs/dist/rpms/db4/devel/db4.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- db4.spec	11 Feb 2006 02:23:09 -0000	1.30
+++ db4.spec	15 Feb 2006 11:06:29 -0000	1.31
@@ -11,11 +11,12 @@
 Summary: The Berkeley DB database library (version 4) for C.
 Name: db4
 Version: 4.3.29
-Release: 1.2.1
+Release: 2
 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
 Patch1: db-4.3.21-java.patch
+Patch2: db-4.3.29-lfs.patch
 Patch4: db-4.2.52-gcj.patch
 Patch10: http://www.sleepycat.com/update/1.85/patch.1.1
 Patch11: http://www.sleepycat.com/update/1.85/patch.1.2
@@ -25,12 +26,12 @@
 URL: http://www.sleepycat.com/
 License: GPL
 Group: System Environment/Libraries
-Obsoletes: db1, db1-devel
-BuildPreReq: perl, libtool, ed, tcl-devel >= 8.4.4
+Obsoletes: db1, db2, db3
+BuildRequires: perl, libtool, ed, tcl-devel >= 8.4.4
 %ifarch %{java_arches}
-BuildPreReq: gcc-java
-BuildPreReq: java-1.4.2-gcj-compat
-BuildPreReq: java-1.4.2-gcj-compat-devel
+BuildRequires: gcc-java
+BuildRequires: java-1.4.2-gcj-compat
+BuildRequires: java-1.4.2-gcj-compat-devel
 %endif
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -48,7 +49,7 @@
 Summary: Command line tools for managing Berkeley DB (version 4) databases.
 Group: Applications/Databases
 Requires: db4 = %{version}-%{release}
-Obsoletes: db2-utils, db3-utils
+Obsoletes: db1-utils, db2-utils, db3-utils
 
 %description utils
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -63,9 +64,9 @@
 
 %package devel
 Summary: Development files for the Berkeley DB (version 4) library.
-Group: System Environment/Libraries
+Group: Development/Libraries
 Requires: db4 = %{version}-%{release}
-Obsoletes: db2-devel, db3-devel
+Obsoletes: db1-devel, db2-devel, db3-devel
 
 %description devel
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -76,7 +77,7 @@
 
 %package tcl
 Summary: Development files for using the Berkeley DB (version 4) with tcl.
-Group: System Environment/Libraries
+Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description tcl
@@ -87,7 +88,7 @@
 
 %package java
 Summary: Development files for using the Berkeley DB (version 4) with Java.
-Group: System Environment/Libraries
+Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description java
@@ -99,6 +100,7 @@
 %prep
 %setup -q -n db-%{version} -a 1
 %patch1 -p1 -b .java
+%patch2 -p1 -b .lfs
 %patch4 -p1 -b .gcj
 
 pushd dist
@@ -138,8 +140,8 @@
             -e 's,="ref/,="../%{name}-devel-%{version}/ref/,g' \
             -e 's,="../sleepycat/,="../../%{name}-devel-%{version}/sleepycat/,g' \
             -e 's,="sleepycat/,="../%{name}-devel-%{version}/sleepycat/,g' \
-            -e 's,="../images/,="../../%{name}-%{version}/images/,g' \
-            -e 's,="images/,="../%{name}-%{version}/images/,g' \
+            -e 's,="../images/,="../../%{name}-devel-%{version}/images/,g' \
+            -e 's,="images/,="../%{name}-devel-%{version}/images/,g' \
             -e 's,="../utility/,="../../%{name}-utils-%{version}/utility/,g' \
             -e 's,="utility/,="../%{name}-utils-%{version}/utility/,g' ${doc} > ${doc}.new
         touch -r ${doc} ${doc}.new
@@ -221,7 +223,7 @@
 unset nptl_s nptl_lo
 case %{_os} in
 linux|Linux)
-	nptl_s=$RPM_SOURCE_DIR/nptl-abi-note.S
+	nptl_s=%{SOURCE2}
 	nptl_lo=nptl-abi-note.lo
 	;;
 esac
@@ -306,7 +308,7 @@
 
 %files
 %defattr(-,root,root)
-%doc LICENSE README docs/images
+%doc LICENSE README
 /%{_lib}/libdb-%{__soversion}.so
 %{_libdir}/libdb-%{__soversion}.so
 %{_libdir}/libdb_cxx-%{__soversion}.so
@@ -329,7 +331,7 @@
 %files devel
 %defattr(-,root,root)
 %doc	docs/api_c docs/api_cxx docs/api_tcl docs/index.html
-%doc	docs/ref docs/sleepycat
+%doc	docs/ref docs/sleepycat docs/images
 %doc	examples_c examples_cxx
 %{_libdir}/libdb.so
 %{_libdir}/libdb_cxx.so
@@ -356,6 +358,16 @@
 %endif
 
 %changelog
+* Wed Feb 15 2006 Jindrich Novy <jnovy at redhat.com> 4.3.29-2
+- don't package /usr/share/doc/images in the main db4 package
+  and move it to db4-devel (#33328)
+- make db4 LFS capable (#33849)
+- move db4-devel, db4-tcl, db4-java to Development/Libraries
+  group instead of System Environment/Libraries (#54320)
+- BuildPrereq -> BuildRequires
+- don't use RPM_SOURCE_DIR
+- Obsoletes db3, db2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.3.29-1.2.1
 - bump again for double-long bug on ppc(64)
 


