Author: qboosh Date: Sun Dec 11 13:22:54 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- added default_db bcond (now off by default)
---- Files affected:
packages/db4.8:
db4.8.spec (1.6 -> 1.7)
---- Diffs:
================================================================
Index: packages/db4.8/db4.8.spec
diff -u packages/db4.8/db4.8.spec:1.6 packages/db4.8/db4.8.spec:1.7
--- packages/db4.8/db4.8.spec:1.6 Sun Dec 11 13:44:22 2011
+++ packages/db4.8/db4.8.spec Sun Dec 11 14:22:49 2011
@@ -1,9 +1,10 @@
# $Revision$, $Date$
#
# Conditional build:
-%bcond_without java # don't build java bindings
+%bcond_without java # don't build Java bindings
%bcond_without tcl # don't build Tcl bindings
%bcond_without static_libs # don't build static libraries
+%bcond_with default_db # use this db as default system db
%include /usr/lib/rpm/macros.java
@@ -33,11 +34,17 @@
BuildRequires: sed >= 4.0
%{?with_tcl:BuildRequires: tcl-devel >= 8.4.0}
Requires: uname(release) >= 2.6.0
-Provides: db = %{libver}
+%if %{with default_db}
Provides: db = %{version}-%{release}
+Provides: db = %{libver}
Obsoletes: db4
+%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%if %{without default_db}
+%define _includedir %{_prefix}/include/db%{libver}
+%endif
+
%description
The Berkeley Database (Berkeley DB) is a programmatic toolkit that
provides embedded database support for both traditional and
@@ -55,10 +62,12 @@
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: db-devel
Obsoletes: db3-devel
Obsoletes: db4-devel
+%endif
%description devel
The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -87,10 +96,12 @@
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: db-static
Obsoletes: db3-static
Obsoletes: db4-static
+%endif
%description static
The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -118,8 +129,10 @@
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++.
@@ -133,8 +146,10 @@
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}
Obsoletes: db-cxx-devel
+%endif
Conflicts: db-devel < 4.1.25-3
%description cxx-devel
@@ -148,8 +163,10 @@
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}
Obsoletes: db-cxx-static
+%endif
Conflicts: db-static < 4.2.50-1
%description cxx-static
@@ -163,9 +180,11 @@
Summary(pl.UTF-8): Biblioteka baz danych Berkeley dla Javy
Group: Libraries
Requires: jpackage-utils
+%if %{with default_db}
Provides: db-java = %{version}-%{release}
# db.jar conflicts
Obsoletes: db-java
+%endif
%description java
Berkeley database library for Java.
@@ -178,8 +197,10 @@
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}
Obsoletes: db-java-devel
+%endif
Conflicts: db-devel < 4.1.25-3
%description java-devel
@@ -193,8 +214,10 @@
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.
@@ -207,8 +230,10 @@
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}
Obsoletes: db-tcl-devel
+%endif
Conflicts: db-devel < 4.1.25-3
%description tcl-devel
@@ -222,10 +247,12 @@
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: db-utils
Obsoletes: db3-utils
Obsoletes: db4-utils
+%endif
%description utils
The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -307,7 +334,7 @@
%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
@@ -315,17 +342,30 @@
%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 \
+ includedir=%{_includedir}
%endif
%{__make} -C build_unix library_install \
DESTDIR=$RPM_BUILD_ROOT \
LIB_INSTALL_FILE_LIST="" \
- docdir=%{_docdir}/db-%{version}-docs
+ docdir=%{_docdir}/db-%{version}-docs \
+ includedir=%{_includedir}
+%if %{with default_db}
+install -d $RPM_BUILD_ROOT/%{_lib}
mv $RPM_BUILD_ROOT%{_libdir}/libdb-%{libver}.so $RPM_BUILD_ROOT/%{_lib}
+%endif
cd $RPM_BUILD_ROOT%{_libdir}
+%if %{with static_libs}
+mv -f libdb.a libdb-%{libver}.a
+mv -f libdb_cxx.a libdb_cxx-%{libver}.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-%{libver}.so libdb.so
ln -sf /%{_lib}/libdb-%{libver}.so libdb4.so
ln -sf /%{_lib}/libdb-%{libver}.so libdb-%{libver}.so
@@ -333,24 +373,22 @@
ln -sf libdb-%{libver}.la libdb.la
ln -sf libdb-%{libver}.la libdb4.la
ln -sf libdb-%{libver}.la libndbm.la
+ln -sf libdb_cxx-%{libver}.so libdb_cxx.so
+ln -sf libdb_cxx-%{libver}.la libdb_cxx.la
%if %{with java}
ln -sf libdb_java-%{libver}.la libdb_java.la
-mv -f $RPM_BUILD_ROOT%{_libdir}/*.jar $RPM_BUILD_ROOT%{_javadir}
%endif
%if %{with tcl}
ln -sf libdb_tcl-%{libver}.so libdb_tcl.so
ln -sf libdb_tcl-%{libver}.la libdb_tcl.la
%endif
-ln -sf libdb_cxx-%{libver}.la libdb_cxx.la
%if %{with static_libs}
-mv -f libdb.a libdb-%{libver}.a
ln -sf libdb-%{libver}.a libdb.a
ln -sf libdb-%{libver}.a libdb4.a
ln -sf libdb-%{libver}.a libndbm.a
-mv -f libdb_cxx.a libdb_cxx-%{libver}.a
ln -sf libdb_cxx-%{libver}.a libdb_cxx.a
%endif
-ln -sf libdb_cxx-%{libver}.so libdb_cxx.so
+%endif
sed -i "s/old_library=''/old_library='libdb-%{libver}.a'/" libdb-%{libver}.la
sed -i "s/old_library=''/old_library='libdb_cxx-%{libver}.a'/"
libdb_cxx-%{libver}.la
@@ -389,18 +427,26 @@
%files
%defattr(644,root,root,755)
%doc LICENSE README docs/index.html docs/license
+%if %{with default_db}
%attr(755,root,root) /%{_lib}/libdb-%{libver}.so
+%else
+%attr(755,root,root) %{_libdir}/libdb-%{libver}.so
+%endif
%files devel
%defattr(644,root,root,755)
+%{_libdir}/libdb-%{libver}.la
+%if %{with default_db}
%attr(755,root,root) %{_libdir}/libdb-%{libver}.so
%attr(755,root,root) %{_libdir}/libdb4.so
%attr(755,root,root) %{_libdir}/libdb.so
%attr(755,root,root) %{_libdir}/libndbm.so
-%{_libdir}/libdb-%{libver}.la
%{_libdir}/libdb4.la
%{_libdir}/libdb.la
%{_libdir}/libndbm.la
+%else
+%dir %{_includedir}
+%endif
%{_includedir}/db.h
%{_includedir}/db_185.h
%dir %{_docdir}/db-%{version}-docs
@@ -421,10 +467,12 @@
%files static
%defattr(644,root,root,755)
%{_libdir}/libdb-%{libver}.a
+%if %{with default_db}
%{_libdir}/libdb4.a
%{_libdir}/libdb.a
%{_libdir}/libndbm.a
%endif
+%endif
%files cxx
%defattr(644,root,root,755)
@@ -432,9 +480,11 @@
%files cxx-devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libdb_cxx.so
%{_libdir}/libdb_cxx-%{libver}.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_reference/CXX
%{_docdir}/db-%{version}-docs/api_reference/STL
@@ -447,8 +497,10 @@
%files cxx-static
%defattr(644,root,root,755)
%{_libdir}/libdb_cxx-%{libver}.a
+%if %{with default_db}
%{_libdir}/libdb_cxx.a
%endif
+%endif
%if %{with java}
%files java
@@ -458,9 +510,11 @@
%files java-devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libdb_java.so
%{_libdir}/libdb_java-%{libver}.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/gsg_txn/JAVA
@@ -476,9 +530,11 @@
%files tcl-devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libdb_tcl.so
%{_libdir}/libdb_tcl-%{libver}.la
+%if %{with default_db}
+%attr(755,root,root) %{_libdir}/libdb_tcl.so
%{_libdir}/libdb_tcl.la
+%endif
%{_docdir}/db-%{version}-docs/api_reference/TCL
%endif
@@ -503,6 +559,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.7 2011/12/11 13:22:49 qboosh
+- added default_db bcond (now off by default)
+
Revision 1.6 2011/12/11 12:44:22 qboosh
- new URLs, updated to 4.8.30
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/db4.8/db4.8.spec?r1=1.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
