packages: db4.4/db4.4.spec - added default_db bcond (now off by default)

qboosh qboosh at pld-linux.org
Sun Dec 11 07:40:46 CET 2011 

Author: qboosh                       Date: Sun Dec 11 06:40:46 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added default_db bcond (now off by default)

---- Files affected:
packages/db4.4:
   db4.4.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: packages/db4.4/db4.4.spec
diff -u packages/db4.4/db4.4.spec:1.11 packages/db4.4/db4.4.spec:1.12
--- packages/db4.4/db4.4.spec:1.11	Sun Dec 11 07:28:20 2011
+++ packages/db4.4/db4.4.spec	Sun Dec 11 07:40:40 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.4.20
 %define		patchlevel	4
@@ -31,10 +32,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
@@ -52,9 +59,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
@@ -83,9 +92,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
@@ -113,8 +124,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++.
@@ -128,7 +141,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
@@ -142,7 +157,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
@@ -156,7 +173,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.
@@ -169,7 +188,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
@@ -183,8 +204,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.
@@ -197,7 +220,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
@@ -211,10 +236,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:	db4-utils
 # obsolete Ra package
 Obsoletes:	db3-utils
+%endif
 
 %description utils
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -310,7 +337,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
@@ -318,17 +345,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-4.4.so $RPM_BUILD_ROOT/%{_lib}
+%endif
 
 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}/*.jar $RPM_BUILD_ROOT%{_javadir}
+%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
@@ -336,24 +376,22 @@
 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
-mv -f $RPM_BUILD_ROOT%{_libdir}/*.jar $RPM_BUILD_ROOT%{_javadir}
 %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}
-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
-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.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
@@ -388,21 +426,29 @@
 %files
 %defattr(644,root,root,755)
 %doc LICENSE README
+%if %{with default_db}
 %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)
+%{_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
-%{_libdir}/libdb-4.4.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
@@ -418,10 +464,12 @@
 %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
+%endif
 
 %files cxx
 %defattr(644,root,root,755)
@@ -429,9 +477,11 @@
 
 %files cxx-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libdb_cxx.so
 %{_libdir}/libdb_cxx-4.4.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
@@ -442,8 +492,10 @@
 %files cxx-static
 %defattr(644,root,root,755)
 %{_libdir}/libdb_cxx-4.4.a
+%if %{with default_db}
 %{_libdir}/libdb_cxx.a
 %endif
+%endif
 
 %if %{with java}
 %files java
@@ -453,9 +505,11 @@
 
 %files java-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libdb_java.so
 %{_libdir}/libdb_java-4.4.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
@@ -470,9 +524,11 @@
 
 %files tcl-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libdb_tcl.so
 %{_libdir}/libdb_tcl-4.4.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
 
@@ -499,6 +555,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2011/12/11 06:40:40  qboosh
+- added default_db bcond (now off by default)
+
 Revision 1.11  2011/12/11 06:28:20  qboosh
 - updated URLs
 - added 4.4.20.3,4.4.20.4 patches
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/db4.4/db4.4.spec?r1=1.11&r2=1.12&f=u

More information about the pld-cvs-commit mailing list