Author: qboosh Date: Sat Dec 10 07:12:11 2011 GMT Module: packages Tag: HEAD ---- Log message: - added default_db bcond (now disabled by default)
---- Files affected: packages/db4.3: db4.3.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: packages/db4.3/db4.3.spec diff -u packages/db4.3/db4.3.spec:1.20 packages/db4.3/db4.3.spec:1.21 --- packages/db4.3/db4.3.spec:1.20 Fri Dec 9 20:04:59 2011 +++ packages/db4.3/db4.3.spec Sat Dec 10 08:12:06 2011 @@ -6,6 +6,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 @@ -18,7 +19,6 @@ 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 @@ -33,10 +33,16 @@ 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 @@ -54,9 +60,11 @@ 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 @@ -85,9 +93,11 @@ 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 @@ -115,8 +125,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++. @@ -130,7 +142,9 @@ 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 @@ -144,7 +158,9 @@ 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 @@ -158,7 +174,9 @@ 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. @@ -171,7 +189,9 @@ 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 @@ -185,8 +205,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. @@ -199,7 +221,9 @@ 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 @@ -213,8 +237,10 @@ 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 @@ -308,23 +334,36 @@ %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 @@ -332,24 +371,22 @@ 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 @@ -365,6 +402,8 @@ %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 @@ -382,21 +421,29 @@ %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 @@ -410,10 +457,12 @@ %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) @@ -421,9 +470,11 @@ %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 @@ -433,8 +484,10 @@ %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 @@ -444,9 +497,11 @@ %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 @@ -460,9 +515,11 @@ %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 @@ -488,6 +545,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.21 2011/12/10 07:12:06 qboosh +- added default_db bcond (now disabled by default) + Revision 1.20 2011/12/09 19:04:59 qboosh - updated URLs - added 4.3.29.1 patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/db4.3/db4.3.spec?r1=1.20&r2=1.21&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
