[perl-SDL] - Rebase to 2.2.6 upstream release (#679313)

[Hans de Goede]

commit b0a8882f1eb8a47fc631c5b0d44c23e05d4d31f7
Author: Hans de Goede <hdegoede(a)redhat.com&gt;
Date:   Tue Feb 22 09:58:58 2011 +0100

    - Rebase to 2.2.6 upstream release (#679313)

 .gitignore                  |    1 +
 filter-provides.sh          |    2 +-
 perl-SDL-gfxPie.patch       |   34 ----------------------------------
 perl-SDL-no-mixertest.patch |   19 ++++++++++---------
 perl-SDL.spec               |   27 +++++++--------------------
 sources                     |    3 +--
 6 files changed, 20 insertions(+), 66 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cd200f1..25f0fb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 SDL_Perl-2.1.3.tar.gz
 sdlperl_2.1.2-1.diff.gz
+/SDL_Perl-v2.2.6.tar.gz
diff --git a/filter-provides.sh b/filter-provides.sh
index 7b04dde..03eb178 100755
--- a/filter-provides.sh
+++ b/filter-provides.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 /usr/lib/rpm/redhat/find-provides "$@" | \
-  grep -vE 'perl\(main\)|perl\(Walker\)'
+  grep -vE 'perl\(Walker\)|\.so'
diff --git a/perl-SDL-no-mixertest.patch b/perl-SDL-no-mixertest.patch
index b7745da..477eb95 100644
--- a/perl-SDL-no-mixertest.patch
+++ b/perl-SDL-no-mixertest.patch
@@ -1,21 +1,22 @@
---- SDL_Perl-2.1.3/t/mixerpm.t.no-mixertest	2005-10-05 11:25:49.000000000 +0200
-+++ SDL_Perl-2.1.3/t/mixerpm.t	2006-08-15 08:42:41.000000000 +0200
-@@ -16,7 +16,7 @@
- use Test::More;
+diff -up SDL_Perl-v2.2.6/t/mixerpm.t~ SDL_Perl-v2.2.6/t/mixerpm.t
+--- SDL_Perl-v2.2.6/t/mixerpm.t~	2009-11-07 21:47:35.000000000 +0100
++++ SDL_Perl-v2.2.6/t/mixerpm.t	2011-02-22 09:40:21.988394662 +0100
+@@ -57,7 +57,7 @@ if( check_fail_mixer() )
+ 
  
  if ( SDL::Config->has('SDL_mixer') ) {
 -	plan ( tests => 3 );
 +	plan ( tests => 2 );
- } else {
+ }			
+ else {
  	plan ( skip_all => 'SDL_mixer support not compiled' );
- }
-@@ -59,9 +59,3 @@
+@@ -101,9 +101,3 @@ can_ok ('SDL::Mixer', qw/
  	playing
  	playing_music
  	/);
 -
+-
 -# these are exported by default, so main:: should know them:
--SDL::Init(SDL_INIT_AUDIO);
 -my $mixer = SDL::Mixer->new();
--isa_ok($mixer, 'SDL::Mixer');
+-isa_ok($mixer, 'SDL::Mixer', 'Checking if mixer can be build');
 -
diff --git a/perl-SDL.spec b/perl-SDL.spec
index 620f3fb..0816fb4 100644
--- a/perl-SDL.spec
+++ b/perl-SDL.spec
@@ -1,16 +1,14 @@
 Name:           perl-SDL
-Version:        2.1.3
-Release:        15%{?dist}
+Version:        2.2.6
+Release:        1%{?dist}
 Summary:        SDL bindings for the Perl language
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://sdl.perl.org/
-Source0:       
http://search.cpan.org/CPAN/authors/id/D/DG/DGOEHRIG/SDL_Perl-%{version}....
+Source0:       
http://search.cpan.org/CPAN/authors/id/K/KT/KTHAKORE/SDL_Perl-v%{version}...
 Source1:        filter-depends.sh
 Source2:        filter-provides.sh
-Patch0:         http://ftp.debian.org/debian/pool/main/s/sdlperl/sdlperl_2.1.2-1.diff.gz
 Patch1:         %{name}-no-mixertest.patch
-Patch2:         %{name}-gfxPie.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel SDL_image-devel SDL_net-devel SDL_ttf-devel
 BuildRequires:  SDL_gfx-devel libjpeg-devel libpng-devel libGLU-devel perl
@@ -28,25 +26,13 @@ SDL (Simple DirectMedia Layer) bindings for the perl language.
 
 
 %prep
-%setup -q -n SDL_Perl-%{version}
-%patch0 -p1
-# Cherry pick the debian patches we want
-patch -p1 -b -z .deb < debian/patches/030_glu_nurbs.diff
-patch -p1 < debian/patches/030_opengl_fixes.diff
+%setup -q -n SDL_Perl-v%{version}
 %patch1 -p1 -z .no-mixertest
-%patch2 -p0 -z .gfxPie
 
 
 %build
 perl Build.PL
 ./Build
-# <sigh> I don't know why but for some reason these dirs get put under
-# blib/arch/auto/src instead of blib/arch/auto causing them to be installed
-# in the wrong location and "./Build test" to fail. We copy them because if
-# we move them the next call to ./Build will recreate them in the wrong
-# location anyways. Unfortunatly with the copy the wrong located originals
-# will also end up getting installed so we must remove those in %%install
-cp -r blib/arch/auto/src/SDL* blib/arch/auto
 
 
 %check
@@ -56,10 +42,8 @@ cp -r blib/arch/auto/src/SDL* blib/arch/auto
 %install
 rm -rf $RPM_BUILD_ROOT
 ./Build install installdirs=vendor destdir=$RPM_BUILD_ROOT
-rm -fr $RPM_BUILD_ROOT%{perl_vendorarch}/auto/src
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
@@ -76,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Feb 22 2011 Hans de Goede <hdegoede(a)redhat.com&gt; - 2.2.6-1
+- Rebase to 2.2.6 upstream release (#679313)
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; -
2.1.3-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 47d781f..31a8e2b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-6ce26e1b710ce52def4ec22637cd5176  SDL_Perl-2.1.3.tar.gz
-726952ce300a650ec6c9d05085fcc0fb  sdlperl_2.1.2-1.diff.gz
+445950ca7b9991f34ec792bbac8386b6  SDL_Perl-v2.2.6.tar.gz