X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgdbm.git;a=blobdiff_plain;f=gdbm.spec;h=b97ffb1364bf170c16533cedc062bf0503a80eec;hp=73c5ae80e2fb241a0af739bf57937e17ccddfa70;hb=ade3666e7bbbd094b103066d776f1854fca6b0ee;hpb=17dd1af146c99b2a49f47a724076c4b52302df0e

diff --git a/gdbm.spec b/gdbm.spec
index 73c5ae8..b97ffb1 100644
--- a/gdbm.spec
+++ b/gdbm.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
-%bcond_without	gdbmexport	# gdbmexport compatibility tool
-#
+%bcond_without	tests	# unit tests
+
 Summary:	GNU database library for C
 Summary(de.UTF-8):	GNU-Datenbank-Library für C
 Summary(fr.UTF-8):	La librairie GNU de bases de données pout le langage C
@@ -9,19 +9,21 @@ Summary(pl.UTF-8):	Biblioteka GNU bazy danych dla języka C
 Summary(ru.UTF-8):	Библиотека базы данных GNU для C
 Summary(uk.UTF-8):	Бібліотека бази даних GNU для C
 Name:		gdbm
-Version:	1.10
-Release:	3
+Version:	1.17
+Release:	1
 License:	GPL v3+
 Group:		Libraries
 Source0:	http://ftp.gnu.org/gnu/gdbm/%{name}-%{version}.tar.gz
-# Source0-md5:	88770493c2559dc80b561293e39d3570
+# Source0-md5:	f20ce117abc6f302ecf62c34d41c1ecf
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-link-compat.patch
-BuildRequires:	autoconf >= 2.63
+Patch2:		%{name}-link.patch
+URL:		http://www.gnu.org/software/gdbm/
+BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake >= 1:1.11
-%{?with_gdbmexport:BuildRequires:	gdbm18-devel >= 1.8.3}
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools >= 0.18
 BuildRequires:	libtool
+BuildRequires:	readline-devel
 BuildRequires:	texinfo
 Obsoletes:	libgdbm2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -131,24 +133,11 @@ Biblioteka statyczna gdbm.
 %description static -l uk.UTF-8
 Це статична бібліотека gdbm, бази даних GNU.
 
-%package export
-Summary:	gdbmexport utility to export old GDBM 1.8.x databases
-Summary(pl.UTF-8):	Narzędzie gdbmexport pozwalające wyeksportować stare bazy GDBM 1.8.x
-Group:		Applications/File
-Requires:	gdbm18 >= 1.8.3
-
-%description export
-gdbmexport utility to export old GDBM 1.8.x databases in order to load
-them in new GDBM format.
-
-%description export -l pl.UTF-8
-Narzędzie gdbmexport pozwalające wyeksportować stare bazy GDBM 1.8.x w
-celu wczytania do nowego formatu GDBM.
-
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -158,15 +147,12 @@ celu wczytania do nowego formatu GDBM.
 %{__automake}
 %configure \
 	--enable-libgdbm-compat \
-	--disable-silent-rules \
-%if %{with gdbmexport}
-	--enable-gdbm-export \
-	--with-gdbm183-includedir=%{_includedir}/gdbm-1.8 \
-	--with-gdbm183-library="-lgdbm-1.8"
-%endif
+	--disable-silent-rules
 
 %{__make}
 
+%{?with_tests:%{__make} check}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -190,11 +176,16 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS NOTE-WARNING README
-%attr(755,root,root) %{_bindir}/testgdbm
+%attr(755,root,root) %{_bindir}/gdbm_dump
+%attr(755,root,root) %{_bindir}/gdbm_load
+%attr(755,root,root) %{_bindir}/gdbmtool
 %attr(755,root,root) %{_libdir}/libgdbm.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgdbm.so.4
+%attr(755,root,root) %ghost %{_libdir}/libgdbm.so.6
 %attr(755,root,root) %{_libdir}/libgdbm_compat.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgdbm_compat.so.4
+%{_mandir}/man1/gdbm_dump.1*
+%{_mandir}/man1/gdbm_load.1*
+%{_mandir}/man1/gdbmtool.1*
 
 %files devel
 %defattr(644,root,root,755)
@@ -212,9 +203,3 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libgdbm.a
 %{_libdir}/libgdbm_compat.a
-
-%if %{with gdbmexport}
-%files export
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gdbmexport
-%endif