From a691bf016af9b8f42faea69e1e9ef5d56f4a9da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 16 May 2016 12:57:24 +0200 Subject: [PATCH] 1.838 bump --- .gitignore | 1 + ...e-objects-only-from-original-thread-co.patch | 12 ++++++------ perl-DB_File.spec | 17 ++++++++++++----- sources | 2 +- 4 files changed, 20 insertions(+), 12 deletions(-) rename DB_File-1.833-Destroy-DB_File-objects-only-from-original-thread-co.patch => DB_File-1.838-Destroy-DB_File-objects-only-from-original-thread-co.patch (95%) diff --git a/.gitignore b/.gitignore index 885621d..1ef64fc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /DB_File-1.833.tar.gz /DB_File-1.834.tar.gz /DB_File-1.835.tar.gz +/DB_File-1.838.tar.gz diff --git a/DB_File-1.833-Destroy-DB_File-objects-only-from-original-thread-co.patch b/DB_File-1.838-Destroy-DB_File-objects-only-from-original-thread-co.patch similarity index 95% rename from DB_File-1.833-Destroy-DB_File-objects-only-from-original-thread-co.patch rename to DB_File-1.838-Destroy-DB_File-objects-only-from-original-thread-co.patch index 895bc8f..cdb51d5 100644 --- a/DB_File-1.833-Destroy-DB_File-objects-only-from-original-thread-co.patch +++ b/DB_File-1.838-Destroy-DB_File-objects-only-from-original-thread-co.patch @@ -1,4 +1,4 @@ -From 6d488944a7b5f5342bd249c7fe045df79779ed8e Mon Sep 17 00:00:00 2001 +From bfb2cb3cddffa144b521bb5dff76af1e065288ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 10 Jun 2014 14:28:09 +0200 Subject: [PATCH] Destroy DB_File objects only from original thread context @@ -28,7 +28,7 @@ Signed-off-by: Petr Písař create mode 100644 t/db-threads.t diff --git a/DB_File.xs b/DB_File.xs -index d060dcb..83d77ea 100755 +index f417b22..ed6a904 100755 --- a/DB_File.xs +++ b/DB_File.xs @@ -407,6 +407,7 @@ typedef union INFO { @@ -39,7 +39,7 @@ index d060dcb..83d77ea 100755 DB * dbp ; SV * compare ; bool in_compare ; -@@ -1007,6 +1008,7 @@ SV * sv ; +@@ -1006,6 +1007,7 @@ SV * sv ; name, flags, mode, sv == NULL) ; #endif Zero(RETVAL, 1, DB_File_type) ; @@ -47,7 +47,7 @@ index d060dcb..83d77ea 100755 /* Default to HASH */ RETVAL->filtering = 0 ; -@@ -1279,6 +1281,7 @@ SV * sv ; +@@ -1278,6 +1280,7 @@ SV * sv ; /* printf("In ParseOpenInfo name=[%s] flags=[%d] mode = [%d]\n", name, flags, mode) ; */ Zero(RETVAL, 1, DB_File_type) ; @@ -55,7 +55,7 @@ index d060dcb..83d77ea 100755 /* Default to HASH */ RETVAL->filtering = 0 ; -@@ -1598,27 +1601,36 @@ db_DESTROY(db) +@@ -1597,27 +1600,36 @@ db_DESTROY(db) INIT: CurrentDB = db ; Trace(("DESTROY %p\n", db)); @@ -176,5 +176,5 @@ index 0000000..b9f69b6 +untie %h; +unlink ; -- -1.9.3 +2.5.5 diff --git a/perl-DB_File.spec b/perl-DB_File.spec index 531aa5a..0091fa0 100644 --- a/perl-DB_File.spec +++ b/perl-DB_File.spec @@ -1,6 +1,6 @@ Name: perl-DB_File -Version: 1.835 -Release: 365%{?dist} +Version: 1.838 +Release: 1%{?dist} Summary: Perl5 access to Berkeley DB version 1.x License: GPL+ or Artistic Group: Development/Libraries @@ -8,9 +8,13 @@ URL: http://search.cpan.org/dist/DB_File/ Source0: http://www.cpan.org/authors/id/P/PM/PMQS/DB_File-%{version}.tar.gz # Destroy DB_File objects only from original thread context, bug #1107732, # CPAN RT#96357 -Patch0: DB_File-1.833-Destroy-DB_File-objects-only-from-original-thread-co.patch +Patch0: DB_File-1.838-Destroy-DB_File-objects-only-from-original-thread-co.patch +BuildRequires: coreutils +BuildRequires: findutils BuildRequires: libdb-devel BuildRequires: perl +BuildRequires: perl-devel +BuildRequires: perl-generators BuildRequires: perl(Config) BuildRequires: perl(ExtUtils::Constant) BuildRequires: perl(ExtUtils::MakeMaker) >= 5.16 @@ -58,8 +62,8 @@ make %{?_smp_mflags} %install make pure_install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; +find $RPM_BUILD_ROOT -type f -name .packlist -delete +find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -delete %{_fixperms} $RPM_BUILD_ROOT/* %check @@ -72,6 +76,9 @@ make test %{_mandir}/man3/* %changelog +* Mon May 16 2016 Petr Pisar - 1.838-1 +- 1.838 bump + * Sat May 14 2016 Jitka Plesnikova - 1.835-365 - Increase release to favour standalone package diff --git a/sources b/sources index 2d4df52..eaa20c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ae7910cabc31a44e50b713a8a475514 DB_File-1.835.tar.gz +1b489d4c85784135df72836d491a2217 DB_File-1.838.tar.gz