X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdb4.7.git;a=blobdiff_plain;f=db4.7.spec;h=fa72d03614e957e9a32ac2ce76665db71bb0000d;hp=43a97d8eef10d94c8cd1f7330cdcdab04c142a80;hb=31397b7d7750c74282022b6612285be4048fdfcc;hpb=7a14dd65398b468d21b5e9657090d17bbe8d198e

diff --git a/db4.7.spec b/db4.7.spec
index 43a97d8..fa72d03 100644
--- a/db4.7.spec
+++ b/db4.7.spec
@@ -1,16 +1,11 @@
 #
 # Conditional build:
+%bcond_without	apidocs		# do not build and package API docs
 %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
 
-%if "%{pld_release}" == "ti"
-%bcond_without	java_sun	# build with gcj
-%else
-%bcond_with	java_sun	# build with java-sun
-%endif
-
-%include	/usr/lib/rpm/macros.java
+%{?with_java:%include	/usr/lib/rpm/macros.java}
 
 %define		libver		4.7
 %define		ver			%{libver}.25
@@ -19,7 +14,7 @@ Summary:	Berkeley DB database library for C
 Summary(pl.UTF-8):	Biblioteka C do obsługi baz Berkeley DB
 Name:		db4.7
 Version:	%{ver}.%{patchlevel}
-Release:	3
+Release:	6
 Epoch:		0
 License:	GPL-like (see LICENSE)
 Group:		Libraries
@@ -30,9 +25,7 @@ URL:		http://www.oracle.com/technology/products/berkeley-db/index.html
 BuildRequires:	automake
 BuildRequires:	ed
 %if %{with java}
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
-BuildRequires:	rpm >= 4.4.9-56
+BuildRequires:	jdk
 BuildRequires:	rpm-javaprov
 %endif
 BuildRequires:	libstdc++-devel
@@ -41,6 +34,7 @@ BuildRequires:	sed >= 4.0
 %{?with_tcl:BuildRequires:	tcl-devel >= 8.4.0}
 Requires:	uname(release) >= 2.6.0
 Provides:	db = %{version}-%{release}
+Provides:	db = %{libver}
 Obsoletes:	db4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -122,6 +116,13 @@ dla C, C++, Javy i Perla.
 Ten pakiet zawiera statyczne biblioteki do budowania programów
 używających Berkeley DB.
 
+%package apidocs
+Summary:	Berkeley database library API documentation
+Group:		Documentation
+
+%description apidocs
+API and internal documentation for Berkeley database library.
+
 %package cxx
 Summary:	Berkeley database library for C++
 Summary(pl.UTF-8):	Biblioteka baz danych Berkeley dla C++
@@ -373,6 +374,9 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/db-java-%{version}
 cp -rf examples_java/* $RPM_BUILD_ROOT%{_examplesdir}/db-java-%{version}
 %endif
 
+# in %doc
+rm -f $RPM_BUILD_ROOT%{_docdir}/db-%{version}-docs/{index.html,license/license_db.html}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -387,11 +391,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE README
+%doc LICENSE README docs/index.html docs/license
 %attr(755,root,root) /%{_lib}/libdb-%{libver}.so
-%dir %{_docdir}/db-%{version}-docs
-%{_docdir}/db-%{version}-docs/index.html
-%{_docdir}/db-%{version}-docs/license
 
 %files devel
 %defattr(644,root,root,755)
@@ -405,6 +406,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libndbm.la
 %{_includedir}/db.h
 %{_includedir}/db_185.h
+%{_examplesdir}/db-%{version}
+
+%if %{with static_libs}
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libdb-%{libver}.a
+%{_libdir}/libdb4.a
+%{_libdir}/libdb.a
+%{_libdir}/libndbm.a
+%endif
+
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%dir %{_docdir}/db-%{version}-docs
 %{_docdir}/db-%{version}-docs/api_c
 %{_docdir}/db-%{version}-docs/articles
 %dir %{_docdir}/db-%{version}-docs/gsg
@@ -414,16 +430,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/db-%{version}-docs/gsg_db_rep
 %{_docdir}/db-%{version}-docs/gsg_db_rep/C
 %{_docdir}/db-%{version}-docs/images
+%{_docdir}/db-%{version}-docs/porting
 %{_docdir}/db-%{version}-docs/ref
-%{_examplesdir}/db-%{version}
-
-%if %{with static_libs}
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libdb-%{libver}.a
-%{_libdir}/libdb4.a
-%{_libdir}/libdb.a
-%{_libdir}/libndbm.a
 %endif
 
 %files cxx
@@ -497,4 +505,5 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/db*_stat
 %attr(755,root,root) %{_bindir}/db*_upgrade
 %attr(755,root,root) %{_bindir}/db*_verify
+%dir %{_docdir}/db-%{version}-docs
 %{_docdir}/db-%{version}-docs/utility