OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Sep-2006 09:56:34
Branch: HEAD Handle: 2006092708563400
Modified files:
openpkg-src/perl-dbix perl-dbix.patch perl-dbix.spec
Log:
modifying package: perl-dbix-5.8.8 20060923 -> 20060927
Summary:
Revision Changes Path
1.6 +24 -31 openpkg-src/perl-dbix/perl-dbix.patch
1.115 +2 -2 openpkg-src/perl-dbix/perl-dbix.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbix/perl-dbix.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 perl-dbix.patch
--- openpkg-src/perl-dbix/perl-dbix.patch 14 Apr 2006 17:53:37 -0000
1.5
+++ openpkg-src/perl-dbix/perl-dbix.patch 27 Sep 2006 07:56:34 -0000
1.6
@@ -1,6 +1,6 @@
-Index: DBIx-SearchBuilder-1.43/Makefile.PL
---- DBIx-SearchBuilder-1.43/Makefile.PL.orig 2006-01-04 09:48:34 +0100
-+++ DBIx-SearchBuilder-1.43/Makefile.PL 2006-01-04 10:01:18 +0100
+Index: DBIx-SearchBuilder-1.45/Makefile.PL
+--- DBIx-SearchBuilder-1.45/Makefile.PL.orig 2006-05-28 01:02:22 +0200
++++ DBIx-SearchBuilder-1.45/Makefile.PL 2006-09-27 09:52:45 +0200
@@ -7,7 +7,7 @@
requires('Want');
requires('Encode');
@@ -10,9 +10,9 @@
requires('Clone');
build_requires('Test::More' => 0.52);
build_requires('DBD::SQLite');
-Index: DBIx-SearchBuilder-1.43/SearchBuilder/Record/Cachable.pm
---- DBIx-SearchBuilder-1.43/SearchBuilder/Record/Cachable.pm.orig
2005-07-15 23:24:29 +0200
-+++ DBIx-SearchBuilder-1.43/SearchBuilder/Record/Cachable.pm 2006-01-04
10:00:29 +0100
+Index: DBIx-SearchBuilder-1.45/SearchBuilder/Record/Cachable.pm
+--- DBIx-SearchBuilder-1.45/SearchBuilder/Record/Cachable.pm.orig
2006-09-12 01:19:30 +0200
++++ DBIx-SearchBuilder-1.45/SearchBuilder/Record/Cachable.pm 2006-09-27
09:55:18 +0200
@@ -7,7 +7,7 @@
use DBIx::SearchBuilder::Handle;
@ISA = qw (DBIx::SearchBuilder::Record);
@@ -22,41 +22,34 @@
use strict;
-@@ -49,8 +49,10 @@
+@@ -39,8 +39,10 @@
+
sub _SetupCache {
- my $self = shift;
- my $cache = shift;
-- $_CACHES{$cache} = Cache::Simple::TimedExpiry->new();
+ my ($self, $cache) = @_;
+- $_CACHES{$cache} = new Cache::Simple::TimedExpiry;
- $_CACHES{$cache}->expire_after( $self->_CacheConfig->{'cache_for_sec'}
);
+ $_CACHES{$cache} = Cache::MemoryCache->new({
+ 'namespace' => 'DBIx::SearchBuilder::Record::Cache($cache)',
+ 'default_expires_in' => $self->_CacheConfig->{'cache_for_sec'}
+ });
+ return $_CACHES{$cache};
}
- =head2 FlushCache
-@@ -195,7 +197,7 @@
+@@ -177,7 +179,7 @@
sub _fetch () {
my ( $self, $cache_key ) = @_;
-- my $data = $self->_RecordCache->fetch($cache_key) or return;
-+ my $data = $self->_RecordCache->get($cache_key) or return;
-
+- my $data = $self->_RecordCache->fetch( $cache_key ) or return 0;
++ my $data = $self->_RecordCache->get($cache_key) or return 0;
@{$self}{keys %$data} = values %$data; # deserialize
return 1;
-@@ -306,13 +308,13 @@
- my $alternate_key = shift;
- return undef unless ($alternate_key);
-
-- my $primary_key = $self->_KeyCache->fetch($alternate_key);
-+ my $primary_key = $self->_KeyCache->get($alternate_key);
- if ($primary_key) {
- return ($primary_key);
- }
-
- # If the alternate key is really the primary one
-- elsif ( $self->_RecordCache->fetch($alternate_key) ) {
-+ elsif ( $self->_RecordCache->get($alternate_key) ) {
- return ($alternate_key);
- }
- else { # empty!
+ }
+@@ -264,7 +266,7 @@
+ sub _lookup_primary_RecordCache_key {
+ my ($self, $key) = @_;
+ return undef unless $key;
+- return $self->_KeyCache->fetch($key) || $key;
++ return $self->_KeyCache->get($key) || $key;
+ }
+
+ =head2 _CacheConfig
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbix/perl-dbix.spec
============================================================================
$ cvs diff -u -r1.114 -r1.115 perl-dbix.spec
--- openpkg-src/perl-dbix/perl-dbix.spec 23 Sep 2006 11:05:03 -0000
1.114
+++ openpkg-src/perl-dbix/perl-dbix.spec 27 Sep 2006 07:56:34 -0000
1.115
@@ -26,7 +26,7 @@
%define V_perl 5.8.8
%define V_dbix_dbschema 0.31
%define V_dbix_datasource 0.02
-%define V_dbix_searchbuilder 1.43
+%define V_dbix_searchbuilder 1.45
%define V_dbix_dwiw 0.44
%define V_dbix_ha 0.95
%define V_dbix_anydbd 2.01
@@ -54,7 +54,7 @@
Group: Perl
License: GPL/Artistic
Version: %{V_perl}
-Release: 20060923
+Release: 20060927
# list of sources
Source0:
http://www.cpan.org/modules/by-module/DBIx/DBIx-DBSchema-%{V_dbix_dbschema}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
