Prechádzať zdrojové kódy

Cache::Simple::TimedExpiry is now available in perl-cache, so remove hack which actually breaks SearchBuilder under RT

Ralf S. Engelschall 19 rokov pred
rodič
commit
d851eff2bd
2 zmenil súbory, kde vykonal 1 pridanie a 58 odobranie
  1. 0 55
      perl-dbix/perl-dbix.patch
  2. 1 3
      perl-dbix/perl-dbix.spec

+ 0 - 55
perl-dbix/perl-dbix.patch

@@ -1,55 +0,0 @@
-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');
- requires('Class::ReturnValue', 0.40);
--requires('Cache::Simple::TimedExpiry' => '0.21');
-+requires('Cache::MemoryCache');
- requires('Clone');
- build_requires('Test::More' => 0.52);
- build_requires('DBD::SQLite');
-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);
- 
--use Cache::Simple::TimedExpiry;
-+use Cache::MemoryCache;
- 
- use strict;
- 
-@@ -39,8 +39,10 @@
- 
- sub _SetupCache {
-     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};
- }
- 
-@@ -177,7 +179,7 @@
- 
- sub _fetch () {
-     my ( $self, $cache_key ) = @_;
--    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;
- }
-@@ -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 

+ 1 - 3
perl-dbix/perl-dbix.spec

@@ -54,7 +54,7 @@ Class:        BASE
 Group:        Perl
 License:      GPL/Artistic
 Version:      %{V_perl}
-Release:      20061013
+Release:      20061112
 
 #   list of sources
 Source0:      http://www.cpan.org/modules/by-module/DBIx/DBIx-DBSchema-%{V_dbix_dbschema}.tar.gz
@@ -75,7 +75,6 @@ Source14:     http://www.cpan.org/modules/by-module/Class/Class-DBI-Plugin-Retri
 Source15:     http://www.cpan.org/modules/by-module/Class/Class-DBI-AsForm-%{V_class_dbi_asform}.tar.gz
 Source16:     http://www.cpan.org/modules/by-module/Class/Class-DBI-View-%{V_class_dbi_view}.tar.gz
 Source17:     http://www.cpan.org/modules/by-module/DBIx/DBIx-Wrapper-%{V_dbix_wrapper}.tar.gz
-Patch0:       perl-dbix.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -219,7 +218,6 @@ AutoReqProv:  no
     %setup -q -T -D -a 15
     %setup -q -T -D -a 16
     %setup -q -T -D -a 17
-    %patch -p0
 
 %build