- release 6 (for allow upgrade from RH version),

- added %%{_includedir}/db2 directory to %files list,
- "Provides: glibc-db2" replaced by "BuildConflicts: glibc-db2".

Changed files:
    db2.spec -> 1.3

diff --git a/db2.spec b/db2.spec
index 1d3b17b57464d0ba21f69c83550f0325f09301de..2ecdbe9d002ba59b89cc87d100918623c00d295b 100644 (file)
--- a/db2.spec
+++ b/db2.spec
@@ -1,30 +1,35 @@
 Summary:       BSD database library for C
 Name:          db2
 Version:       2.4.14
-Release:       1
+Release:       6
 Group:         Libraries
+Group(de):     Libraries
+Group(fr):     Librairies
+Group(pl):     Biblioteki
 License:       BSD
 URL:           http://www.sleepycat.com
 # Source0:     http://www.sleepycat.com/update/2.7.7/db-2.7.7.tar.gz
 # Taken from glibc 2.1.3
-Source0:       db2-glibc-2.1.3.tar.gz
+Source0:       %{name}-glibc-2.1.3.tar.gz
 # Patch to make it standalone
-Patch0:                db2-glibc-2.1.3.patch
-Patch1:                db2-libdb2.patch
+Patch0:                %{name}-glibc-2.1.3.patch
+Patch1:                %{name}-libdb2.patch
 PreReq:                /sbin/ldconfig
 Conflicts:     glibc < 2.1.90
-Obsoletes:     glibc-db2
-Provides:      glibc-db2
+BuildConflicts:        glibc-db2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Obsoletes:     glibc-db2
 
 %description
-The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
-embedded database support for both traditional and client/server applications.
-This library used to be part of the glibc package.
+The Berkeley Database (Berkeley DB) is a programmatic toolkit that
+provides embedded database support for both traditional and
+client/server applications. This library used to be part of the glibc
+package.
 
 %package devel
 Summary:       Development libraries and header files for Berkeley database library
 Group:         Development/Libraries
+Group(de):     Entwicklung/Libraries
 Group(fr):     Development/Librairies
 Group(pl):     Programowanie/Biblioteki
 Requires:      %{name} = %{version}
@@ -32,10 +37,10 @@ Conflicts:  glibc-devel < 2.1.90
 Obsoletes:     glibc-db2-devel
 
 %description devel
-The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
-embedded database support for both traditional and client/server applications.
-Berkeley DB includes B tree, Hashing, Fixed and Variable-length record access
-methods.
+The Berkeley Database (Berkeley DB) is a programmatic toolkit that
+provides embedded database support for both traditional and
+client/server applications. Berkeley DB includes B tree, Hashing,
+Fixed and Variable-length record access methods.
 
 This package contains the header files, libraries, and documentation
 for building programs which use Berkeley DB.
@@ -43,6 +48,7 @@ for building programs which use Berkeley DB.
 %package static
 Summary:       Static libraries for Berkeley database library
 Group:         Development/Libraries
+Group(de):     Entwicklung/Libraries
 Group(fr):     Development/Librairies
 Group(pl):     Programowanie/Biblioteki
 Requires:      %{name}-devel = %{version}
@@ -50,13 +56,13 @@ Conflicts:  glibc-static < 2.1.90
 Obsoletes:     glibc-db2-static
 
 %description static
-The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
-embedded database support for both traditional and client/server applications.
-Berkeley DB includes B tree, Hashing, Fixed and Variable-length record access
-methods.
+The Berkeley Database (Berkeley DB) is a programmatic toolkit that
+provides embedded database support for both traditional and
+client/server applications. Berkeley DB includes B tree, Hashing,
+Fixed and Variable-length record access methods.
 
-This package contains the static libraries for building programs which use
-Berkeley DB.
+This package contains the static libraries for building programs which
+use Berkeley DB.
 
 %prep
 %setup -q -n db2
@@ -64,33 +70,30 @@ Berkeley DB.
 %patch1 -p1
 
 %build
-%{__make} CFLAGS="$RPM_OPT_FLAGS -I. -I./include -include ./compat.h"
+%{__make} CFLAGS="%{!?debug:$RPM_OPT_FLAGS}%{?debug:-O -g} -I. -I./include -include ./compat.h"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/lib,%{_includedir}/db2,%{_libdir},%{_bindir}}
 
 install libdb2.so.3 $RPM_BUILD_ROOT/lib/
-install libdb2.a $RPM_BUILD_ROOT/%{_libdir}/
-install db.h db_185.h $RPM_BUILD_ROOT/%{_includedir}/db2
+install libdb2.a $RPM_BUILD_ROOT%{_libdir}
+install db.h db_185.h $RPM_BUILD_ROOT%{_includedir}/db2
 
 for p in db_archive db_checkpoint db_deadlock db_dump db_load \
-        db_printlog db_recover db_stat; do
+       db_printlog db_recover db_stat; do
        q="`echo $p | sed -e 's,^db_,db2_,'`"
-       install $p $RPM_BUILD_ROOT/%{_bindir}/$q
+               install $p $RPM_BUILD_ROOT%{_bindir}/$q
 done
 
-ln -sf ../../lib/libdb2.so.3 $RPM_BUILD_ROOT/%{_libdir}/libdb2.so
-
-strip --strip-unneeded $RPM_BUILD_ROOT%{_bindir}/*
-strip --strip-unneeded $RPM_BUILD_ROOT/lib/lib*.so.*
+ln -sf ../../lib/libdb2.so.3 $RPM_BUILD_ROOT%{_libdir}/libdb2.so
 
 gzip -9nf README LICENSE
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
@@ -100,6 +103,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
+%dir %{_includedir}/db2
 %{_includedir}/db2/db.h
 %{_includedir}/db2/db_185.h
 %attr(755,root,root) %{_libdir}/libdb2.so