- added default_db bcond (now disabled by default)

Changed files:
    db4.3.spec -> 1.21

diff --git a/db4.3.spec b/db4.3.spec
index 2bbdf1de4b99a2321205520959d97cbc3fcef006..b773b65f6577ee88c4235e7ccde28b2574f44e39 100644 (file)
--- a/db4.3.spec
+++ b/db4.3.spec
@@ -5,6 +5,7 @@
 %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_with    default_db      # use this db as default system db
 #
 %define                ver             4.3.29
 %define                patchlevel      1
@@ -17,7 +18,6 @@ Release:      1
 Epoch:         0
 License:       Sleepycat public license (GPL-like, see LICENSE)
 Group:         Libraries
-# alternative site (sometimes working): http://www.berkeleydb.com/
 #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: 13585a20ce32f113b8e8cdb57f52e3bb
@@ -32,10 +32,16 @@ BuildRequires:      libstdc++-devel
 BuildRequires: libtool >= 2:2.2
 BuildRequires: sed >= 4.0
 %{?with_tcl:BuildRequires:     tcl-devel >= 8.4.0}
+%if %{with default_db}
 Provides:      db = %{version}-%{release}
 Obsoletes:     db4
+%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%if %{without default_db}
+%define                _includedir     %{_prefix}/include/db4.2
+%endif
+
 %description
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
 provides embedded database support for both traditional and
@@ -53,9 +59,11 @@ Summary:     Header files for Berkeley database library
 Summary(pl.UTF-8):     Pliki nagłówkowe do biblioteki Berkeley Database
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+%if %{with default_db}
 Provides:      db-devel = %{version}-%{release}
 Obsoletes:     db3-devel
 Obsoletes:     db4-devel
+%endif
 
 %description devel
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -84,9 +92,11 @@ Summary:     Static libraries for Berkeley database library
 Summary(pl.UTF-8):     Statyczne biblioteki Berkeley Database
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
+%if %{with default_db}
 Provides:      db-static = %{version}-%{release}
 Obsoletes:     db3-static
 Obsoletes:     db4-static
+%endif
 
 %description static
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -114,8 +124,10 @@ używających Berkeley DB.
 Summary:       Berkeley database library for C++
 Summary(pl.UTF-8):     Biblioteka baz danych Berkeley dla C++
 Group:         Libraries
+%if %{with default_db}
 Provides:      db-cxx = %{version}-%{release}
 Obsoletes:     db4-cxx
+%endif
 
 %description cxx
 Berkeley database library for C++.
@@ -129,7 +141,9 @@ 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}
+%if %{with default_db}
 Provides:      db-cxx-devel = %{version}-%{release}
+%endif
 Conflicts:     db-devel < 4.1.25-3
 
 %description cxx-devel
@@ -143,7 +157,9 @@ Summary:    Static version of db-cxx library
 Summary(pl.UTF-8):     Statyczna wersja biblioteki db-cxx
 Group:         Development/Libraries
 Requires:      %{name}-cxx-devel = %{epoch}:%{version}-%{release}
+%if %{with default_db}
 Provides:      db-cxx-static = %{version}-%{release}
+%endif
 Conflicts:     db-static < 4.2.50-1
 
 %description cxx-static
@@ -157,7 +173,9 @@ Summary:    Berkeley database library for Java
 Summary(pl.UTF-8):     Biblioteka baz danych Berkeley dla Javy
 Group:         Libraries
 Requires:      jpackage-utils
+%if %{with default_db}
 Provides:      db-java = %{version}-%{release}
+%endif
 
 %description java
 Berkeley database library for Java.
@@ -170,7 +188,9 @@ Summary:    Development files for db-java library
 Summary(pl.UTF-8):     Pliki programistyczne biblioteki db-java
 Group:         Development/Languages/Java
 Requires:      %{name}-java = %{epoch}:%{version}-%{release}
+%if %{with default_db}
 Provides:      db-java-devel = %{version}-%{release}
+%endif
 Conflicts:     db-devel < 4.1.25-3
 
 %description java-devel
@@ -184,8 +204,10 @@ Summary:   Berkeley database library for Tcl
 Summary(pl.UTF-8):     Biblioteka baz danych Berkeley dla Tcl
 Group:         Development/Languages/Tcl
 Requires:      tcl
+%if %{with default_db}
 Provides:      db-tcl = %{version}-%{release}
 Obsoletes:     db4-tcl
+%endif
 
 %description tcl
 Berkeley database library for Tcl.
@@ -198,7 +220,9 @@ Summary:    Development files for db-tcl library
 Summary(pl.UTF-8):     Pliki programistyczne biblioteki db-tcl
 Group:         Development/Languages/Tcl
 Requires:      %{name}-tcl = %{epoch}:%{version}-%{release}
+%if %{with default_db}
 Provides:      db-tcl-devel = %{version}-%{release}
+%endif
 Conflicts:     db-devel < 4.1.25-3
 
 %description tcl-devel
@@ -212,8 +236,10 @@ Summary:   Command line tools for managing Berkeley DB databases
 Summary(pl.UTF-8):     Narzędzia do obsługi baz Berkeley DB z linii poleceń
 Group:         Applications/Databases
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+%if %{with default_db}
 Provides:      db-utils = %{version}-%{release}
 Obsoletes:     db4-utils
+%endif
 
 %description utils
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -307,23 +333,36 @@ cd ../build_unix
 
 %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
 
 %{__make} -C build_unix.static library_install \
+       DESTDIR=$RPM_BUILD_ROOT \
        docdir=%{_docdir}/db-%{version}-docs \
-       DESTDIR=$RPM_BUILD_ROOT
+       includedir=%{_includedir}
 
 %{__make} -C build_unix library_install \
-       docdir=%{_docdir}/db-%{version}-docs \
        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.3.so $RPM_BUILD_ROOT/%{_lib}
+%endif
 
 cd $RPM_BUILD_ROOT%{_libdir}
+%if %{with static_libs}
+mv -f libdb.a libdb-4.3.a
+mv -f libdb_cxx.a libdb_cxx-4.3.a
+%endif
+%if %{with java}
+mv -f $RPM_BUILD_ROOT%{_libdir}/*.jar $RPM_BUILD_ROOT%{_javadir}
+%endif
+%if %{with default_db}
 ln -sf /%{_lib}/libdb-4.3.so libdb.so
 ln -sf /%{_lib}/libdb-4.3.so libdb4.so
 ln -sf /%{_lib}/libdb-4.3.so libdb-4.3.so
@@ -331,24 +370,22 @@ ln -sf /%{_lib}/libdb-4.3.so libndbm.so
 ln -sf libdb-4.3.la libdb.la
 ln -sf libdb-4.3.la libdb4.la
 ln -sf libdb-4.3.la libndbm.la
+ln -sf libdb_cxx-4.3.so libdb_cxx.so
+ln -sf libdb_cxx-4.3.la libdb_cxx.la
 %if %{with java}
 ln -sf libdb_java-4.3.la libdb_java.la
-mv -f $RPM_BUILD_ROOT%{_libdir}/*.jar $RPM_BUILD_ROOT%{_javadir}
 %endif
 %if %{with tcl}
 ln -sf libdb_tcl-4.3.so libdb_tcl.so
 ln -sf libdb_tcl-4.3.la libdb_tcl.la
 %endif
-ln -sf libdb_cxx-4.3.la libdb_cxx.la
 %if %{with static_libs}
-mv -f libdb.a libdb-4.3.a
 ln -sf libdb-4.3.a libdb.a
 ln -sf libdb-4.3.a libdb4.a
 ln -sf libdb-4.3.a libndbm.a
-mv -f libdb_cxx.a libdb_cxx-4.3.a
 ln -sf libdb_cxx-4.3.a libdb_cxx.a
 %endif
-ln -sf libdb_cxx-4.3.so libdb_cxx.so
+%endif
 
 sed -i "s/old_library=''/old_library='libdb-4.3.a'/" libdb-4.3.la
 sed -i "s/old_library=''/old_library='libdb_cxx-4.3.a'/" libdb_cxx-4.3.la
@@ -364,6 +401,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}
+%else
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/db-%{version}-docs/java
 %endif
 
 %clean
@@ -381,21 +420,29 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc LICENSE README
+%if %{with default_db}
 %attr(755,root,root) /%{_lib}/libdb-4.3.so
+%else
+%attr(755,root,root) %{_libdir}/libdb-4.3.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)
+%{_libdir}/libdb-4.3.la
+%if %{with default_db}
 %attr(755,root,root) %{_libdir}/libdb-4.3.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.3.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
@@ -409,10 +456,12 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libdb-4.3.a
+%if %{with default_db}
 %{_libdir}/libdb4.a
 %{_libdir}/libdb.a
 %{_libdir}/libndbm.a
 %endif
+%endif
 
 %files cxx
 %defattr(644,root,root,755)
@@ -420,9 +469,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files cxx-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libdb_cxx.so
 %{_libdir}/libdb_cxx-4.3.la
+%if %{with default_db}
+%attr(755,root,root) %{_libdir}/libdb_cxx.so
 %{_libdir}/libdb_cxx.la
+%endif
 %{_includedir}/db_cxx.h
 %{_docdir}/db-%{version}-docs/api_cxx
 %{_docdir}/db-%{version}-docs/gsg/CXX
@@ -432,8 +483,10 @@ rm -rf $RPM_BUILD_ROOT
 %files cxx-static
 %defattr(644,root,root,755)
 %{_libdir}/libdb_cxx-4.3.a
+%if %{with default_db}
 %{_libdir}/libdb_cxx.a
 %endif
+%endif
 
 %if %{with java}
 %files java
@@ -443,9 +496,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files java-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libdb_java.so
 %{_libdir}/libdb_java-4.3.la
+%if %{with default_db}
+%attr(755,root,root) %{_libdir}/libdb_java.so
 %{_libdir}/libdb_java.la
+%endif
 %{_docdir}/db-%{version}-docs/collections
 %{_docdir}/db-%{version}-docs/gsg/JAVA
 %{_docdir}/db-%{version}-docs/java
@@ -459,9 +514,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files tcl-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libdb_tcl.so
 %{_libdir}/libdb_tcl-4.3.la
+%if %{with default_db}
+%attr(755,root,root) %{_libdir}/libdb_tcl.so
 %{_libdir}/libdb_tcl.la
+%endif
 %{_docdir}/db-%{version}-docs/api_tcl
 %endif