- unified; install versioned db.jar and db-utils (with symlinks if built as default_db)

[packages/db4.4.git] / db4.4.spec

diff --git a/db4.4.spec b/db4.4.spec
index ee8c1f93eab0f1106965f30297efe7b9a68b6115..bb9af267aac8481c3f6b7dd451aa9f81e4c8edbb 100644 (file)
--- a/db4.4.spec
+++ b/db4.4.spec
@@ -1,59 +1,68 @@
 #
 # Conditional build:
 #
 # Conditional build:

-%bcond_with    java    # build db-java
-%bcond_without tcl     # don't build Tcl bindings
-%bcond_with    pmutex  # use POSIX mutexes (only process-private with linuxthreads)
-%bcond_without nptl    # don't use process-shared POSIX mutexes (NPTL provides full interface)
+%bcond_without java            # don't build Java library
+%bcond_without tcl             # don't build Tcl bindings
+%bcond_with    pmutex          # use POSIX mutexes (only process-private with linuxthreads)
+%bcond_without nptl            # don't use process-shared POSIX mutexes (NPTL provides full interface)

 %bcond_without static_libs     # don't build static libraries
 %bcond_without static_libs     # don't build static libraries

+%bcond_with    default_db      # use this db as default system db

 #
 #

+%define                ver             4.4.20
+%define                patchlevel      4

 %{?with_nptl:%define   with_pmutex     1}
 Summary:       Berkeley DB database library for C
 %{?with_nptl:%define   with_pmutex     1}
 Summary:       Berkeley DB database library for C

-Summary(pl):   Biblioteka C do obs³ugi baz Berkeley DB
+Summary(pl.UTF-8):     Biblioteka C do obsługi baz Berkeley DB

 Name:          db4.4
 Name:          db4.4

-Version:       4.4.20
-Release:       2
+Version:       %{ver}.%{patchlevel}
+Release:       1

 Epoch:         0
 License:       Sleepycat public license (GPL-like, see LICENSE)
 Group:         Libraries
 Epoch:         0
 License:       Sleepycat public license (GPL-like, see LICENSE)
 Group:         Libraries

-# alternative site (sometimes working): http://www.berkeleydb.com/
-#Source0Download: http://dev.sleepycat.com/downloads/releasehistorybdb.html
-Source0:       http://downloads.sleepycat.com/db-%{version}.tar.gz
+#Source0Download: http://www.oracle.com/technetwork/database/berkeleydb/downloads/index-082944.html
+Source0:       http://download.oracle.com/berkeley-db/db-%{ver}.tar.gz

 # Source0-md5: d84dff288a19186b136b0daf7067ade3
 # Source0-md5: d84dff288a19186b136b0daf7067ade3

-Patch0:                http://www.sleepycat.com/update/4.4.20/patch.4.4.20.1
-Patch1:                http://www.sleepycat.com/update/4.4.20/patch.4.4.20.2
-URL:           http://www.sleepycat.com/
+%patchset_source -f http://download.oracle.com/berkeley-db/patches/db/%{ver}/patch.%{ver}.%g 1 %{patchlevel}
+URL:           http://www.oracle.com/technetwork/database/berkeleydb/downloads/index.html

 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: ed
 %{?with_java:BuildRequires:    jdk}
 BuildRequires: libstdc++-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: ed
 %{?with_java:BuildRequires:    jdk}
 BuildRequires: libstdc++-devel

-BuildRequires: libtool
+BuildRequires: libtool >= 2:2.2

 BuildRequires: sed >= 4.0
 %{?with_tcl:BuildRequires:     tcl-devel >= 8.4.0}
 BuildRequires: sed >= 4.0
 %{?with_tcl:BuildRequires:     tcl-devel >= 8.4.0}

+%if %{with default_db}

 Provides:      db = %{version}-%{release}
 Obsoletes:     db4
 Provides:      db = %{version}-%{release}
 Obsoletes:     db4

+%endif

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

+%if %{without default_db}
+%define                _includedir     %{_prefix}/include/db4.4
+%endif
+

 %description
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
 provides embedded database support for both traditional and
 client/server applications. Berkeley DB is used by many applications,
 including Python and Perl, so this should be installed on all systems.
 
 %description
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
 provides embedded database support for both traditional and
 client/server applications. Berkeley DB is used by many applications,
 including Python and Perl, so this should be installed on all systems.
 

-%description -l pl
-Berkeley Database (Berkeley DB) to zestaw narzêdzi programistycznych
-zapewniaj±cych obs³ugê baz danych w aplikacjach tradycyjnych jak i
-klient-serwer. Berkeley db jest u¿ywana w wielu aplikacjach, w tym w
+%description -l pl.UTF-8
+Berkeley Database (Berkeley DB) to zestaw narzędzi programistycznych
+zapewniających obsługę baz danych w aplikacjach tradycyjnych jak i
+klient-serwer. Berkeley db jest używana w wielu aplikacjach, w tym w

 Pythonie i Perlu.
 
 %package devel
 Summary:       Header files for Berkeley database library
 Pythonie i Perlu.
 
 %package devel
 Summary:       Header files for Berkeley database library

-Summary(pl):   Pliki nag³ówkowe do biblioteki Berkeley Database
+Summary(pl.UTF-8):     Pliki nagłówkowe do biblioteki Berkeley Database

 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}

+%if %{with default_db}

 Provides:      db-devel = %{version}-%{release}
 Obsoletes:     db3-devel
 Obsoletes:     db4-devel
 Provides:      db-devel = %{version}-%{release}
 Obsoletes:     db3-devel
 Obsoletes:     db4-devel

+%endif

 
 %description devel
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
 
 %description devel
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that


@@ -66,25 +75,27 @@ recovery. DB supports C, C++, Java and Perl APIs.
 This package contains the header files, libraries, and documentation
 for building programs which use Berkeley DB.
 
 This package contains the header files, libraries, and documentation
 for building programs which use Berkeley DB.
 

-%description devel -l pl
-Berkeley Database (Berkeley DB) to zestaw narzêdzi programistycznych
-zapewniaj±cych obs³ugê baz danych w aplikacjach tradycyjnych jak i
-klient-serwer. Berkeley DB obs³uguje dostêp do bazy przez B-drzewa i
-funkcje mieszaj±ce ze sta³± lub zmienn± wielko¶ci± rekordu,
-transakcje, kroniki, pamiêæ dzielon± i odtwarzanie baz. Ma wsparcie
+%description devel -l pl.UTF-8
+Berkeley Database (Berkeley DB) to zestaw narzędzi programistycznych
+zapewniających obsługę baz danych w aplikacjach tradycyjnych jak i
+klient-serwer. Berkeley DB obsługuje dostęp do bazy przez B-drzewa i
+funkcje mieszające ze stałą lub zmienną wielkością rekordu,
+transakcje, kroniki, pamięć dzieloną i odtwarzanie baz. Ma wsparcie

 dla C, C++, Javy i Perla.
 
 dla C, C++, Javy i Perla.
 

-Ten pakiet zawiera pliki nag³ówkowe i dokumentacjê do budowania
-programów u¿ywaj±cych Berkeley DB.
+Ten pakiet zawiera pliki nagłówkowe i dokumentację do budowania
+programów używających Berkeley DB.

 
 %package static
 Summary:       Static libraries for Berkeley database library
 
 %package static
 Summary:       Static libraries for Berkeley database library

-Summary(pl):   Statyczne biblioteki Berkeley Database
+Summary(pl.UTF-8):     Statyczne biblioteki Berkeley Database

 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}

+%if %{with default_db}

 Provides:      db-static = %{version}-%{release}
 Obsoletes:     db3-static
 Obsoletes:     db4-static
 Provides:      db-static = %{version}-%{release}
 Obsoletes:     db3-static
 Obsoletes:     db4-static

+%endif

 
 %description static
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
 
 %description static
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that


@@ -97,123 +108,139 @@ recovery. DB supports C, C++, Java and Perl APIs.
 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.
 

-%description static -l pl
-Berkeley Database (Berkeley DB) to zestaw narzêdzi programistycznych
-zapewniaj±cych obs³ugê baz danych w aplikacjach tradycyjnych jak i
-klient-serwer. Berkeley DB obs³uguje dostêp do bazy przez B-drzewa i
-funkcje mieszaj±ce ze sta³± lub zmienn± wielko¶ci± rekordu,
-transakcje, kroniki, pamiêæ dzielon± i odtwarzanie baz. Ma wsparcie
+%description static -l pl.UTF-8
+Berkeley Database (Berkeley DB) to zestaw narzędzi programistycznych
+zapewniających obsługę baz danych w aplikacjach tradycyjnych jak i
+klient-serwer. Berkeley DB obsługuje dostęp do bazy przez B-drzewa i
+funkcje mieszające ze stałą lub zmienną wielkością rekordu,
+transakcje, kroniki, pamięć dzieloną i odtwarzanie baz. Ma wsparcie

 dla C, C++, Javy i Perla.
 
 dla C, C++, Javy i Perla.
 

-Ten pakiet zawiera statyczne biblioteki do budowania programów
-u¿ywaj±cych Berkeley DB.
+Ten pakiet zawiera statyczne biblioteki do budowania programów
+używających Berkeley DB.

 
 %package cxx
 Summary:       Berkeley database library for C++
 
 %package cxx
 Summary:       Berkeley database library for C++

-Summary(pl):   Biblioteka baz danych Berkeley dla C++
+Summary(pl.UTF-8):     Biblioteka baz danych Berkeley dla C++

 Group:         Libraries
 Group:         Libraries

+%if %{with default_db}

 Provides:      db-cxx = %{version}-%{release}
 Obsoletes:     db4-cxx
 Provides:      db-cxx = %{version}-%{release}
 Obsoletes:     db4-cxx

+%endif

 
 %description cxx
 Berkeley database library for C++.
 
 
 %description cxx
 Berkeley database library for C++.
 

-%description cxx -l pl
+%description cxx -l pl.UTF-8

 Biblioteka baz danych Berkeley dla C++.
 
 %package cxx-devel
 Summary:       Header files for db-cxx library
 Biblioteka baz danych Berkeley dla C++.
 
 %package cxx-devel
 Summary:       Header files for db-cxx library

-Summary(pl):   Pliki nag³ówkowe biblioteki db-cxx
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki db-cxx

 Group:         Development/Libraries
 Requires:      %{name}-cxx = %{epoch}:%{version}-%{release}
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 Group:         Development/Libraries
 Requires:      %{name}-cxx = %{epoch}:%{version}-%{release}
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}

+%if %{with default_db}

 Provides:      db-cxx-devel = %{version}-%{release}
 Provides:      db-cxx-devel = %{version}-%{release}

+%endif

 Conflicts:     db-devel < 4.1.25-3
 
 %description cxx-devel
 Header files for db-cxx library.
 
 Conflicts:     db-devel < 4.1.25-3
 
 %description cxx-devel
 Header files for db-cxx library.
 

-%description cxx-devel -l pl
-Pliki nag³ówkowe biblioteki db-cxx.
+%description cxx-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki db-cxx.

 
 %package cxx-static
 Summary:       Static version of db-cxx library
 
 %package cxx-static
 Summary:       Static version of db-cxx library

-Summary(pl):   Statyczna wersja biblioteki db-cxx
+Summary(pl.UTF-8):     Statyczna wersja biblioteki db-cxx

 Group:         Development/Libraries
 Requires:      %{name}-cxx-devel = %{epoch}:%{version}-%{release}
 Group:         Development/Libraries
 Requires:      %{name}-cxx-devel = %{epoch}:%{version}-%{release}

+%if %{with default_db}

 Provides:      db-cxx-static = %{version}-%{release}
 Provides:      db-cxx-static = %{version}-%{release}

+%endif

 Conflicts:     db-static < 4.2.50-1
 
 %description cxx-static
 Static version of db-cxx library.
 
 Conflicts:     db-static < 4.2.50-1
 
 %description cxx-static
 Static version of db-cxx library.
 

-%description cxx-static -l pl
+%description cxx-static -l pl.UTF-8

 Statyczna wersja biblioteki db-cxx.
 
 %package java
 Summary:       Berkeley database library for Java
 Statyczna wersja biblioteki db-cxx.
 
 %package java
 Summary:       Berkeley database library for Java

-Summary(pl):   Biblioteka baz danych Berkeley dla Javy
+Summary(pl.UTF-8):     Biblioteka baz danych Berkeley dla Javy

 Group:         Libraries
 Group:         Libraries

-Requires:      jre
+Requires:      jpackage-utils
+%if %{with default_db}

 Provides:      db-java = %{version}-%{release}
 Provides:      db-java = %{version}-%{release}

+%endif

 
 %description java
 Berkeley database library for Java.
 
 
 %description java
 Berkeley database library for Java.
 

-%description java -l pl
+%description java -l pl.UTF-8

 Biblioteka baz danych Berkeley dla Javy.
 
 %package java-devel
 Summary:       Development files for db-java library
 Biblioteka baz danych Berkeley dla Javy.
 
 %package java-devel
 Summary:       Development files for db-java library

-Summary(pl):   Pliki programistyczne biblioteki db-java
+Summary(pl.UTF-8):     Pliki programistyczne biblioteki db-java

 Group:         Development/Languages/Java
 Requires:      %{name}-java = %{epoch}:%{version}-%{release}
 Group:         Development/Languages/Java
 Requires:      %{name}-java = %{epoch}:%{version}-%{release}

+%if %{with default_db}

 Provides:      db-java-devel = %{version}-%{release}
 Provides:      db-java-devel = %{version}-%{release}

+%endif

 Conflicts:     db-devel < 4.1.25-3
 
 %description java-devel
 Development files for db-java library.
 
 Conflicts:     db-devel < 4.1.25-3
 
 %description java-devel
 Development files for db-java library.
 

-%description java-devel -l pl
+%description java-devel -l pl.UTF-8

 Pliki programistyczne biblioteki db-java.
 
 %package tcl
 Summary:       Berkeley database library for Tcl
 Pliki programistyczne biblioteki db-java.
 
 %package tcl
 Summary:       Berkeley database library for Tcl

-Summary(pl):   Biblioteka baz danych Berkeley dla Tcl
+Summary(pl.UTF-8):     Biblioteka baz danych Berkeley dla Tcl

 Group:         Development/Languages/Tcl
 Requires:      tcl
 Group:         Development/Languages/Tcl
 Requires:      tcl

+%if %{with default_db}

 Provides:      db-tcl = %{version}-%{release}
 Obsoletes:     db4-tcl
 Provides:      db-tcl = %{version}-%{release}
 Obsoletes:     db4-tcl

+%endif

 
 %description tcl
 Berkeley database library for Tcl.
 
 
 %description tcl
 Berkeley database library for Tcl.
 

-%description tcl -l pl
+%description tcl -l pl.UTF-8

 Biblioteka baz danych Berkeley dla Tcl.
 
 %package tcl-devel
 Summary:       Development files for db-tcl library
 Biblioteka baz danych Berkeley dla Tcl.
 
 %package tcl-devel
 Summary:       Development files for db-tcl library

-Summary(pl):   Pliki programistyczne biblioteki db-tcl
+Summary(pl.UTF-8):     Pliki programistyczne biblioteki db-tcl

 Group:         Development/Languages/Tcl
 Requires:      %{name}-tcl = %{epoch}:%{version}-%{release}
 Group:         Development/Languages/Tcl
 Requires:      %{name}-tcl = %{epoch}:%{version}-%{release}

+%if %{with default_db}

 Provides:      db-tcl-devel = %{version}-%{release}
 Provides:      db-tcl-devel = %{version}-%{release}

+%endif

 Conflicts:     db-devel < 4.1.25-3
 
 %description tcl-devel
 Development files for db-tcl library.
 
 Conflicts:     db-devel < 4.1.25-3
 
 %description tcl-devel
 Development files for db-tcl library.
 

-%description tcl-devel -l pl
+%description tcl-devel -l pl.UTF-8

 Pliki programistyczne biblioteki db-tcl.
 
 %package utils
 Summary:       Command line tools for managing Berkeley DB databases
 Pliki programistyczne biblioteki db-tcl.
 
 %package utils
 Summary:       Command line tools for managing Berkeley DB databases

-Summary(pl):   Narzêdzia do obs³ugi baz Berkeley DB z linii poleceñ
+Summary(pl.UTF-8):     Narzędzia do obsługi baz Berkeley DB z linii poleceń

 Group:         Applications/Databases
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Group:         Applications/Databases
 Requires:      %{name} = %{epoch}:%{version}-%{release}

+%if %{with default_db}

 Provides:      db-utils = %{version}-%{release}
 Provides:      db-utils = %{version}-%{release}

-Obsoletes:     db4-utils
-# obsolete Ra package
+Obsoletes:     db-utils

 Obsoletes:     db3-utils
 Obsoletes:     db3-utils

+Obsoletes:     db4-utils
+%endif

 
 %description utils
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
 
 %description utils
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that


@@ -226,31 +253,37 @@ recovery. DB supports C, C++, Java and Perl APIs.
 This package contains command line tools for managing Berkeley DB
 databases.
 
 This package contains command line tools for managing Berkeley DB
 databases.
 

-%description utils -l pl
-Berkeley Database (Berkeley DB) to zestaw narzêdzi programistycznych
-zapewniaj±cych obs³ugê baz danych w aplikacjach tradycyjnych jak i
-klient-serwer. Berkeley DB obs³uguje dostêp do bazy przez B-drzewa i
-funkcje mieszaj±ce ze sta³± lub zmienn± wielko¶ci± rekordu,
-transakcje, kroniki, pamiêæ dzielon± i odtwarzanie baz. Ma wsparcie
+%description utils -l pl.UTF-8
+Berkeley Database (Berkeley DB) to zestaw narzędzi programistycznych
+zapewniających obsługę baz danych w aplikacjach tradycyjnych jak i
+klient-serwer. Berkeley DB obsługuje dostęp do bazy przez B-drzewa i
+funkcje mieszające ze stałą lub zmienną wielkością rekordu,
+transakcje, kroniki, pamięć dzieloną i odtwarzanie baz. Ma wsparcie

 dla C, C++, Javy i Perla.
 
 dla C, C++, Javy i Perla.
 

-Ten pakiet zawiera narzêdzia do obs³ugi baz Berkeley DB z linii
-poleceñ.
+Ten pakiet zawiera narzędzia do obsługi baz Berkeley DB z linii
+poleceń.

 
 %prep
 
 %prep

-%setup -q -n db-%{version}
-%patch0 -p0
-%patch1 -p0
+%setup -q -n db-%{ver}
+# official patches
+%patchset_patch 1 %{patchlevel}

 
 

-%if !%{with nptl}
+%if %{without nptl}

 sed -i -e 's,AM_PTHREADS_SHARED("POSIX/.*,:,' dist/aclocal/mutex.ac
 %endif
 
 sed -i -e 's,AM_PTHREADS_SHARED("POSIX/.*,:,' dist/aclocal/mutex.ac
 %endif
 

+sed -i -e '/AC_PROG_LIBTOOL/aLT_OUTPUT' dist/configure.ac
+

 %build
 cd dist
 cp -f /usr/share/aclocal/libtool.m4 aclocal/libtool.ac
 %build
 cd dist
 cp -f /usr/share/aclocal/libtool.m4 aclocal/libtool.ac

+cp -f /usr/share/aclocal/ltoptions.m4 aclocal/ltoptions.ac
+cp -f /usr/share/aclocal/ltsugar.m4 aclocal/ltsugar.ac
+cp -f /usr/share/aclocal/ltversion.m4 aclocal/ltversion.ac
+cp -f /usr/share/aclocal/lt~obsolete.m4 aclocal/lt~obsolete.ac

 cp -f /usr/share/automake/config.sub .
 cp -f /usr/share/automake/config.sub .

-cp -f /usr/share/libtool/ltmain.sh .
+cp -f /usr/share/libtool/config/ltmain.sh .

 sh s_config
 cd ..
 
 sh s_config
 cd ..
 


@@ -263,7 +296,7 @@ CC="%{__cc}"
 CXX="%{__cxx}"
 CFLAGS="%{rpmcflags}"
 CXXFLAGS="%{rpmcflags} -fno-implicit-templates"
 CXX="%{__cxx}"
 CFLAGS="%{rpmcflags}"
 CXXFLAGS="%{rpmcflags} -fno-implicit-templates"

-LDFLAGS="%{rpmldflags}"
+LDFLAGS="%{rpmcflags} %{rpmldflags}"

 export CC CXX CFLAGS CXXFLAGS LDFLAGS
 
 ../dist/%configure \
 export CC CXX CFLAGS CXXFLAGS LDFLAGS
 
 ../dist/%configure \


@@ -303,25 +336,38 @@ cd build_unix
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_bindir},/%{_lib}}
+install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_bindir}}

 %if %{with java}
 install -d $RPM_BUILD_ROOT%{_javadir}
 %endif
 
 %if %{with static_libs}
 %{__make} -C build_unix.static library_install \
 %if %{with java}
 install -d $RPM_BUILD_ROOT%{_javadir}
 %endif
 
 %if %{with static_libs}
 %{__make} -C build_unix.static library_install \

+       DESTDIR=$RPM_BUILD_ROOT \

        docdir=%{_docdir}/db-%{version}-docs \
        docdir=%{_docdir}/db-%{version}-docs \

-       DESTDIR=$RPM_BUILD_ROOT
+       includedir=%{_includedir}

 %endif
 
 %{__make} -C build_unix library_install \
 %endif
 
 %{__make} -C build_unix library_install \

-       docdir=%{_docdir}/db-%{version}-docs \

        DESTDIR=$RPM_BUILD_ROOT \
        DESTDIR=$RPM_BUILD_ROOT \

-       LIB_INSTALL_FILE_LIST=""
+       LIB_INSTALL_FILE_LIST="" \
+       docdir=%{_docdir}/db-%{version}-docs \
+       includedir=%{_includedir}

 
 

+%if %{with default_db}
+install -d $RPM_BUILD_ROOT/%{_lib}

 mv $RPM_BUILD_ROOT%{_libdir}/libdb-4.4.so $RPM_BUILD_ROOT/%{_lib}
 mv $RPM_BUILD_ROOT%{_libdir}/libdb-4.4.so $RPM_BUILD_ROOT/%{_lib}

+%endif

 
 cd $RPM_BUILD_ROOT%{_libdir}
 
 cd $RPM_BUILD_ROOT%{_libdir}

+%if %{with static_libs}
+mv -f libdb.a libdb-4.4.a
+mv -f libdb_cxx.a libdb_cxx-4.4.a
+%endif
+%if %{with java}
+mv -f $RPM_BUILD_ROOT%{_libdir}/db.jar $RPM_BUILD_ROOT%{_javadir}/db-4.4.jar
+%endif
+%if %{with default_db}

 ln -sf /%{_lib}/libdb-4.4.so libdb.so
 ln -sf /%{_lib}/libdb-4.4.so libdb4.so
 ln -sf /%{_lib}/libdb-4.4.so libdb-4.4.so
 ln -sf /%{_lib}/libdb-4.4.so libdb.so
 ln -sf /%{_lib}/libdb-4.4.so libdb4.so
 ln -sf /%{_lib}/libdb-4.4.so libdb-4.4.so


@@ -329,28 +375,37 @@ ln -sf /%{_lib}/libdb-4.4.so libndbm.so
 ln -sf libdb-4.4.la libdb.la
 ln -sf libdb-4.4.la libdb4.la
 ln -sf libdb-4.4.la libndbm.la
 ln -sf libdb-4.4.la libdb.la
 ln -sf libdb-4.4.la libdb4.la
 ln -sf libdb-4.4.la libndbm.la

+ln -sf libdb_cxx-4.4.so libdb_cxx.so
+ln -sf libdb_cxx-4.4.la libdb_cxx.la

 %if %{with java}
 ln -sf libdb_java-4.4.la libdb_java.la
 %if %{with java}
 ln -sf libdb_java-4.4.la libdb_java.la

-mv -f $RPM_BUILD_ROOT%{_libdir}/*.jar $RPM_BUILD_ROOT%{_javadir}
+ln -sf db-4.4.jar $RPM_BUILD_ROOT%{_javadir}/db.jar

 %endif
 %if %{with tcl}
 ln -sf libdb_tcl-4.4.so libdb_tcl.so
 ln -sf libdb_tcl-4.4.la libdb_tcl.la
 %endif
 %endif
 %if %{with tcl}
 ln -sf libdb_tcl-4.4.so libdb_tcl.so
 ln -sf libdb_tcl-4.4.la libdb_tcl.la
 %endif

-ln -sf libdb_cxx-4.4.la libdb_cxx.la

 %if %{with static_libs}
 %if %{with static_libs}

-mv -f libdb.a libdb-4.4.a

 ln -sf libdb-4.4.a libdb.a
 ln -sf libdb-4.4.a libdb4.a
 ln -sf libdb-4.4.a libndbm.a
 ln -sf libdb-4.4.a libdb.a
 ln -sf libdb-4.4.a libdb4.a
 ln -sf libdb-4.4.a libndbm.a

-mv -f libdb_cxx.a libdb_cxx-4.4.a

 ln -sf libdb_cxx-4.4.a libdb_cxx.a
 %endif
 ln -sf libdb_cxx-4.4.a libdb_cxx.a
 %endif

-ln -sf libdb_cxx-4.4.so libdb_cxx.so
+%endif

 
 sed -i "s/old_library=''/old_library='libdb-4.4.a'/" libdb-4.4.la
 sed -i "s/old_library=''/old_library='libdb_cxx-4.4.a'/" libdb_cxx-4.4.la
 
 
 sed -i "s/old_library=''/old_library='libdb-4.4.a'/" libdb-4.4.la
 sed -i "s/old_library=''/old_library='libdb_cxx-4.4.a'/" libdb_cxx-4.4.la
 

+cd -
+
+cd $RPM_BUILD_ROOT%{_bindir}
+mv -f berkeley_db_svc berkeley_db_svc-4.4
+%{?with_default_db:ln -sf berkeley_db_svc-4.4 berkeley_db_svc}
+for F in db_*; do
+  Fver=$(echo $F|sed 's/db_/db4.4_/')
+  mv $F $Fver
+  %{?with_default_db:ln -sf $Fver $F}
+done

 cd -
 rm -f examples_c*/tags
 install -d $RPM_BUILD_ROOT%{_examplesdir}/db-%{version}
 cd -
 rm -f examples_c*/tags
 install -d $RPM_BUILD_ROOT%{_examplesdir}/db-%{version}


@@ -362,6 +417,8 @@ cp -rf examples_cxx/* $RPM_BUILD_ROOT%{_examplesdir}/db-cxx-%{version}
 %if %{with java}
 install -d $RPM_BUILD_ROOT%{_examplesdir}/db-java-%{version}
 cp -rf examples_java/* $RPM_BUILD_ROOT%{_examplesdir}/db-java-%{version}
 %if %{with java}
 install -d $RPM_BUILD_ROOT%{_examplesdir}/db-java-%{version}
 cp -rf examples_java/* $RPM_BUILD_ROOT%{_examplesdir}/db-java-%{version}

+%else
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/db-%{version}-docs/java

 %endif
 
 %clean
 %endif
 
 %clean


@@ -379,21 +436,29 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc LICENSE README
 %files
 %defattr(644,root,root,755)
 %doc LICENSE README

+%if %{with default_db}

 %attr(755,root,root) /%{_lib}/libdb-4.4.so
 %attr(755,root,root) /%{_lib}/libdb-4.4.so

+%else
+%attr(755,root,root) %{_libdir}/libdb-4.4.so
+%endif

 %dir %{_docdir}/db-%{version}-docs
 %{_docdir}/db-%{version}-docs/sleepycat
 %{_docdir}/db-%{version}-docs/index.html
 
 %files devel
 %defattr(644,root,root,755)
 %dir %{_docdir}/db-%{version}-docs
 %{_docdir}/db-%{version}-docs/sleepycat
 %{_docdir}/db-%{version}-docs/index.html
 
 %files devel
 %defattr(644,root,root,755)

+%{_libdir}/libdb-4.4.la
+%if %{with default_db}

 %attr(755,root,root) %{_libdir}/libdb-4.4.so
 %attr(755,root,root) %{_libdir}/libdb4.so
 %attr(755,root,root) %{_libdir}/libdb.so
 %attr(755,root,root) %{_libdir}/libndbm.so
 %attr(755,root,root) %{_libdir}/libdb-4.4.so
 %attr(755,root,root) %{_libdir}/libdb4.so
 %attr(755,root,root) %{_libdir}/libdb.so
 %attr(755,root,root) %{_libdir}/libndbm.so

-%{_libdir}/libdb-4.4.la

 %{_libdir}/libdb4.la
 %{_libdir}/libdb.la
 %{_libdir}/libndbm.la
 %{_libdir}/libdb4.la
 %{_libdir}/libdb.la
 %{_libdir}/libndbm.la

+%else
+%dir %{_includedir}
+%endif

 %{_includedir}/db.h
 %{_includedir}/db_185.h
 %{_docdir}/db-%{version}-docs/api_c
 %{_includedir}/db.h
 %{_includedir}/db_185.h
 %{_docdir}/db-%{version}-docs/api_c


@@ -409,10 +474,12 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libdb-4.4.a
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libdb-4.4.a

+%if %{with default_db}

 %{_libdir}/libdb4.a
 %{_libdir}/libdb.a
 %{_libdir}/libndbm.a
 %endif
 %{_libdir}/libdb4.a
 %{_libdir}/libdb.a
 %{_libdir}/libndbm.a
 %endif

+%endif

 
 %files cxx
 %defattr(644,root,root,755)
 
 %files cxx
 %defattr(644,root,root,755)


@@ -420,9 +487,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files cxx-devel
 %defattr(644,root,root,755)
 
 %files cxx-devel
 %defattr(644,root,root,755)

-%attr(755,root,root) %{_libdir}/libdb_cxx.so

 %{_libdir}/libdb_cxx-4.4.la
 %{_libdir}/libdb_cxx-4.4.la

+%if %{with default_db}
+%attr(755,root,root) %{_libdir}/libdb_cxx.so

 %{_libdir}/libdb_cxx.la
 %{_libdir}/libdb_cxx.la

+%endif

 %{_includedir}/db_cxx.h
 %{_docdir}/db-%{version}-docs/api_cxx
 %{_docdir}/db-%{version}-docs/gsg/CXX
 %{_includedir}/db_cxx.h
 %{_docdir}/db-%{version}-docs/api_cxx
 %{_docdir}/db-%{version}-docs/gsg/CXX


@@ -433,20 +502,27 @@ rm -rf $RPM_BUILD_ROOT
 %files cxx-static
 %defattr(644,root,root,755)
 %{_libdir}/libdb_cxx-4.4.a
 %files cxx-static
 %defattr(644,root,root,755)
 %{_libdir}/libdb_cxx-4.4.a

+%if %{with default_db}

 %{_libdir}/libdb_cxx.a
 %endif
 %{_libdir}/libdb_cxx.a
 %endif

+%endif

 
 %if %{with java}
 %files java
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdb_java-4.4.so
 
 %if %{with java}
 %files java
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdb_java-4.4.so

+%{_javadir}/db-4.4.jar
+%if %{with default_db}

 %{_javadir}/db.jar
 %{_javadir}/db.jar

+%endif

 
 %files java-devel
 %defattr(644,root,root,755)
 
 %files java-devel
 %defattr(644,root,root,755)

-%attr(755,root,root) %{_libdir}/libdb_java.so

 %{_libdir}/libdb_java-4.4.la
 %{_libdir}/libdb_java-4.4.la

+%if %{with default_db}
+%attr(755,root,root) %{_libdir}/libdb_java.so

 %{_libdir}/libdb_java.la
 %{_libdir}/libdb_java.la

+%endif

 %{_docdir}/db-%{version}-docs/collections
 %{_docdir}/db-%{version}-docs/gsg/JAVA
 %{_docdir}/db-%{version}-docs/gsg_txn/JAVA
 %{_docdir}/db-%{version}-docs/collections
 %{_docdir}/db-%{version}-docs/gsg/JAVA
 %{_docdir}/db-%{version}-docs/gsg_txn/JAVA


@@ -461,25 +537,42 @@ rm -rf $RPM_BUILD_ROOT
 
 %files tcl-devel
 %defattr(644,root,root,755)
 
 %files tcl-devel
 %defattr(644,root,root,755)

-%attr(755,root,root) %{_libdir}/libdb_tcl.so

 %{_libdir}/libdb_tcl-4.4.la
 %{_libdir}/libdb_tcl-4.4.la

+%if %{with default_db}
+%attr(755,root,root) %{_libdir}/libdb_tcl.so

 %{_libdir}/libdb_tcl.la
 %{_libdir}/libdb_tcl.la

+%endif

 %{_docdir}/db-%{version}-docs/api_tcl
 %endif
 
 %files utils
 %defattr(644,root,root,755)
 %{_docdir}/db-%{version}-docs/api_tcl
 %endif
 
 %files utils
 %defattr(644,root,root,755)

+%attr(755,root,root) %{_bindir}/berkeley_db_svc-4.4
+%attr(755,root,root) %{_bindir}/db4.4_archive
+%attr(755,root,root) %{_bindir}/db4.4_checkpoint
+%attr(755,root,root) %{_bindir}/db4.4_deadlock
+%attr(755,root,root) %{_bindir}/db4.4_dump
+#%attr(755,root,root) %{_bindir}/db4.4_dump185
+%attr(755,root,root) %{_bindir}/db4.4_hotbackup
+%attr(755,root,root) %{_bindir}/db4.4_load
+%attr(755,root,root) %{_bindir}/db4.4_printlog
+%attr(755,root,root) %{_bindir}/db4.4_recover
+%attr(755,root,root) %{_bindir}/db4.4_stat
+%attr(755,root,root) %{_bindir}/db4.4_upgrade
+%attr(755,root,root) %{_bindir}/db4.4_verify
+%if %{with default_db}

 %attr(755,root,root) %{_bindir}/berkeley_db_svc
 %attr(755,root,root) %{_bindir}/berkeley_db_svc

-%attr(755,root,root) %{_bindir}/db*_archive
-%attr(755,root,root) %{_bindir}/db*_checkpoint
-%attr(755,root,root) %{_bindir}/db*_deadlock
-%attr(755,root,root) %{_bindir}/db*_dump
-#%attr(755,root,root) %{_bindir}/db*_dump185
-%attr(755,root,root) %{_bindir}/db*_hotbackup
-%attr(755,root,root) %{_bindir}/db*_load
-%attr(755,root,root) %{_bindir}/db*_printlog
-%attr(755,root,root) %{_bindir}/db*_recover
-%attr(755,root,root) %{_bindir}/db*_stat
-%attr(755,root,root) %{_bindir}/db*_upgrade
-%attr(755,root,root) %{_bindir}/db*_verify
+%attr(755,root,root) %{_bindir}/db_archive
+%attr(755,root,root) %{_bindir}/db_checkpoint
+%attr(755,root,root) %{_bindir}/db_deadlock
+%attr(755,root,root) %{_bindir}/db_dump
+#%attr(755,root,root) %{_bindir}/db_dump185
+%attr(755,root,root) %{_bindir}/db_hotbackup
+%attr(755,root,root) %{_bindir}/db_load
+%attr(755,root,root) %{_bindir}/db_printlog
+%attr(755,root,root) %{_bindir}/db_recover
+%attr(755,root,root) %{_bindir}/db_stat
+%attr(755,root,root) %{_bindir}/db_upgrade
+%attr(755,root,root) %{_bindir}/db_verify
+%endif

 %{_docdir}/db-%{version}-docs/utility
 %{_docdir}/db-%{version}-docs/utility