Author: qboosh Date: Sun Aug 14 09:19:09 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated to 1.9.1 NOTE: sonames changed; database format could have changed on those archs, which didn't previously use largefile by default; see gdbm18 and gdbm-export packages for compatibility and db conversion) - updated info,link-compat patches - removed obsolete jbj,linking,make-jN patches
---- Files affected: packages/gdbm: gdbm-info.patch (1.3 -> 1.4) , gdbm-link-compat.patch (1.1 -> 1.2) , gdbm.spec (1.81 -> 1.82) , gdbm-jbj.patch (1.1 -> NONE) (REMOVED), gdbm-linking.patch (1.2 -> NONE) (REMOVED), gdbm-make-jN.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/gdbm/gdbm-info.patch diff -u packages/gdbm/gdbm-info.patch:1.3 packages/gdbm/gdbm-info.patch:1.4 --- packages/gdbm/gdbm-info.patch:1.3 Wed Dec 25 02:27:09 2002 +++ packages/gdbm/gdbm-info.patch Sun Aug 14 11:19:04 2011 @@ -1,14 +1,14 @@ ---- gdbm-1.8.3/gdbm.texinfo.orig Tue Oct 15 23:59:38 2002 -+++ gdbm-1.8.3/gdbm.texinfo Tue Dec 24 23:43:32 2002 -@@ -2,9 +2,9 @@ - @comment %**start of header (This is for running Texinfo on a region.) - @setfilename gdbm.info - @settitle gdbm +--- gdbm-1.9.1/doc/gdbm.texinfo.orig 2011-08-11 14:07:32.000000000 +0200 ++++ gdbm-1.9.1/doc/gdbm.texinfo 2011-08-14 09:30:31.906384656 +0200 +@@ -6,9 +6,9 @@ + @settitle gdbm manual + + @ifinfo -@dircategory Programming & development tools +@dircategory Libraries: @direntry --* GDBM: (gdbm). The GNU database manager. +-* GDBM: (gdbm). The GNU database manager. +* GDBM: (gdbm). The GNU database manager @end direntry - @c @setchapternewpage odd - @comment %**end of header (This is for running Texinfo on a region.) + @end ifinfo + ================================================================ Index: packages/gdbm/gdbm-link-compat.patch diff -u packages/gdbm/gdbm-link-compat.patch:1.1 packages/gdbm/gdbm-link-compat.patch:1.2 --- packages/gdbm/gdbm-link-compat.patch:1.1 Tue Feb 6 01:40:20 2007 +++ packages/gdbm/gdbm-link-compat.patch Sun Aug 14 11:19:04 2011 @@ -1,11 +1,8 @@ ---- gdbm-1.8.3/Makefile.in~ 2007-02-06 01:33:16.000000000 +0100 -+++ gdbm-1.8.3/Makefile.in 2007-02-06 01:35:16.000000000 +0100 -@@ -161,7 +161,7 @@ - libgdbm_compat.la: $(C_LOBJS) gdbm.h - rm -f libgdbm_compat.la - $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libgdbm_compat.la -rpath $(libdir) \ -- -version-info $(SHLIB_VER) $(C_LOBJS) -+ -version-info $(SHLIB_VER) $(C_LOBJS) libgdbm.la +--- gdbm-1.9.1/compat/Makefile.am.orig 2011-08-09 16:58:44.000000000 +0200 ++++ gdbm-1.9.1/compat/Makefile.am 2011-08-14 10:31:15.926382830 +0200 +@@ -50,4 +50,5 @@ + libgdbm_compat_la_SOURCES = $(DBM_CF) $(NDBM_CF) + + libgdbm_compat_la_LDFLAGS = -version-info $(VI_CURRENT):$(VI_REVISION):$(VI_AGE) ++libgdbm_compat_la_LIBADD = $(top_builddir)/src/libgdbm.la - gdbm.h: gdbm.proto gdbmerrno.h gdbm.proto2 - rm -f gdbm.h ================================================================ Index: packages/gdbm/gdbm.spec diff -u packages/gdbm/gdbm.spec:1.81 packages/gdbm/gdbm.spec:1.82 --- packages/gdbm/gdbm.spec:1.81 Thu Mar 13 21:58:03 2008 +++ packages/gdbm/gdbm.spec Sun Aug 14 11:19:04 2011 @@ -1,4 +1,8 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_without gdbmexport # gdbmexport compatibility tool +# 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 @@ -6,19 +10,17 @@ Summary(ru.UTF-8): Библиотека базы данных GNU для C Summary(uk.UTF-8): Бібліотека бази даних GNU для C Name: gdbm -Version: 1.8.3 -Release: 8 -License: GPL +Version: 1.9.1 +Release: 1 +License: GPL v3+ Group: Libraries -Source0: ftp://ftp.gnu.org/pub/gnu/gdbm/%{name}-%{version}.tar.gz -# Source0-md5: 1d1b1d5c0245b1c00aff92da751e9aa1 +Source0: http://ftp.gnu.org/gnu/gdbm/%{name}-%{version}.tar.gz +# Source0-md5: 59f6e4c4193cb875964ffbe8aa384b58 Patch0: %{name}-info.patch -Patch1: %{name}-jbj.patch -Patch2: %{name}-linking.patch -Patch3: %{name}-link-compat.patch -Patch4: %{name}-make-jN.patch -BuildRequires: autoconf -BuildRequires: automake +Patch1: %{name}-link-compat.patch +BuildRequires: autoconf >= 2.63 +BuildRequires: automake >= 1:1.11 +%{?with_gdbmexport:BuildRequires: gdbm18-devel >= 1.8.3} BuildRequires: libtool BuildRequires: texinfo Obsoletes: libgdbm2 @@ -129,29 +131,47 @@ %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 +%setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build %{__libtoolize} %{__aclocal} %{__autoheader} %{__autoconf} -%configure +%{__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 %{__make} %install rm -rf $RPM_BUILD_ROOT -%{__make} -j1 install install-compat \ - INSTALL_ROOT=$RPM_BUILD_ROOT \ - BINOWN=`id -u` BINGRP=`id -g` +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -159,28 +179,43 @@ %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%post devel -p /sbin/postshell +%post devel -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} -%postun devel -p /sbin/postshell +%postun devel -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} %files %defattr(644,root,root,755) -%doc ChangeLog NEWS README -%attr(755,root,root) %{_libdir}/lib*.so.*.* +%doc AUTHORS ChangeLog NEWS NOTE-WARNING README +%attr(755,root,root) %{_bindir}/testgdbm +%attr(755,root,root) %{_libdir}/libgdbm.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libgdbm.so.4 +%attr(755,root,root) %{_libdir}/libgdbm_compat.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libgdbm_compat.so.4 %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/lib*.so -%{_libdir}/lib*.la -%{_mandir}/man3/* -%{_includedir}/* -%{_infodir}/gdbm* +%attr(755,root,root) %{_libdir}/libgdbm.so +%attr(755,root,root) %{_libdir}/libgdbm_compat.so +%{_libdir}/libgdbm.la +%{_libdir}/libgdbm_compat.la +%{_includedir}/dbm.h +%{_includedir}/gdbm.h +%{_includedir}/ndbm.h +%{_mandir}/man3/gdbm.3* +%{_infodir}/gdbm.info* %files static %defattr(644,root,root,755) -%{_libdir}/lib*.a +%{_libdir}/libgdbm.a +%{_libdir}/libgdbm_compat.a + +%if %{with gdbmexport} +%files export +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/gdbmexport +%endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -188,6 +223,14 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.82 2011/08/14 09:19:04 qboosh +- updated to 1.9.1 + NOTE: sonames changed; database format could have changed on those archs, + which didn't previously use largefile by default; + see gdbm18 and gdbm-export packages for compatibility and db conversion) +- updated info,link-compat patches +- removed obsolete jbj,linking,make-jN patches + Revision 1.81 2008/03/13 20:58:03 arekm - rel 8 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdbm/gdbm-info.patch?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdbm/gdbm-link-compat.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdbm/gdbm.spec?r1=1.81&r2=1.82&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
