diff --git a/.gitignore b/.gitignore index a983630..20142c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -BerkeleyDB-0.41.tar.gz +BerkeleyDB-0.42.tar.gz diff --git a/perl-BerkeleyDB.spec b/perl-BerkeleyDB.spec index 6fd5be8..2aa4588 100644 --- a/perl-BerkeleyDB.spec +++ b/perl-BerkeleyDB.spec @@ -1,16 +1,23 @@ -# Need to know the exact DB version we're built against -%global db_ver %(sed '/DB_VERSION_STRING/!d;s/.*Berkeley DB[[:space:]]*\\([^:]*\\):.*/\\1/' /usr/include/db4/db.h 2>/dev/null || echo 4.0.0) +# We have db4 up to Fedora 13, then db5 (in the libdb package) +%if 0%{?fedora} > 13 +%global db_pkg libdb +%else +%global db_pkg db4 +%endif + +# We need to know the exact DB version we're built against +%global db_ver %(sed '/DB_VERSION_STRING/!d;s/.*Berkeley DB[[:space:]]*\\([^:]*\\):.*/\\1/' /usr/include/db.h 2>/dev/null || echo 4.0.0) Name: perl-BerkeleyDB -Version: 0.41 -Release: 3%{?dist} -Summary: Perl extension for Berkeley DB version 2, 3 or 4 +Version: 0.42 +Release: 1%{?dist} +Summary: Interface to Berkeley DB License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/BerkeleyDB/ Source0: http://www.cpan.org/authors/id/P/PM/PMQS/BerkeleyDB-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: db4-devel +BuildRequires: %{db_pkg}-devel BuildRequires: perl(ExtUtils::MakeMaker) # For "make test". BuildRequires: perl(MLDBM) @@ -18,7 +25,7 @@ BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # Hard-code Berkeley DB requirement to avoid problems like #592209 -Requires: db4 = %{db_ver} +Requires: %{db_pkg} = %{db_ver} # Don't "provide" private Perl libs %{?perl_default_filter} @@ -42,7 +49,7 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +make pure_install DESTDIR=$RPM_BUILD_ROOT install -D -m755 dbinfo $RPM_BUILD_ROOT%{_bindir}/dbinfo @@ -60,13 +67,23 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc Changes README Todo -%{perl_vendorarch}/auto/* -%{perl_vendorarch}/BerkeleyDB* -%{_mandir}/man3/* -%{_bindir}/* +%doc README Changes Todo +%{_bindir}/dbinfo +%{perl_vendorarch}/BerkeleyDB/ +%{perl_vendorarch}/BerkeleyDB.pm +%doc %{perl_vendorarch}/BerkeleyDB.pod +%{perl_vendorarch}/auto/BerkeleyDB/ +%{_mandir}/man3/BerkeleyDB.3pm* %changelog +* Wed Jul 7 2010 Paul Howarth - 0.42-1 +- Update to 0.42 + - added $db->Env method to retrieve environment object from a database object + - get the tied interface to use truncate in the CLEAR method if available +- Build with libdb (Berkeley DB 5.x) from Fedora 14 onwards (#612139) +- Tag BerkeleyDB.pod as %%doc +- Use DESTDIR rather than PERL_INSTALL_ROOT + * Tue May 25 2010 Paul Howarth - 0.41-3 - Rebuild for Berkeley DB 4.8.30 in F-13 and Rawhide (#592209) - Hard-code Berkeley DB requirement to avoid problems like #592209 diff --git a/sources b/sources index 23733f7..51b6b8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5941c90783a55ca4280c2963bbe1ac83 BerkeleyDB-0.41.tar.gz +4b9c1f6e62b6ef40e6bdc673a3a30a32 BerkeleyDB-0.42.tar.gz