Merge branch 'master' into el5

Conflicts:
	.gitignore
	perl-SUPER.spec
	sources

.gitignore

@@ -1 +1 @@
-SUPER-1.15.tar.gz
+SUPER-1.17.tar.gz

filter-provides.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-/usr/lib/rpm/perl.prov $* |
- sed -e '/perl(UNIVERSAL)/d' -e '/perl(DB)/d'

perl-SUPER.spec

@@ -1,30 +1,33 @@
 Name:           perl-SUPER
-Version:        1.16
+Version:        1.17
-Release:        1%{?dist}
+Release:        6%{?dist}
 Summary:        Sane superclass method dispatcher
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/SUPER/
-Source0:        http://www.cpan.org/authors/id/C/CH/CHROMATIC/SUPER-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/C/CH/CHROMATIC/SUPER-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# We don't really want to provide: perl(UNIVERSAL)
+BuildRequires:  perl(Module::Build) 
-Source98: filter-provides.sh
+BuildRequires:  perl(Test::Simple) >= 0.61
-%define __perl_provides %{SOURCE98}
+BuildRequires:  perl(Sub::Identify) >= 0.03
-
+BuildRequires:  perl(Scalar::Util) >= 1.20
-BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(Sub::Identify)
 
-# not picked up due to use base
 Requires:       perl(Exporter)
+Requires:       perl(Scalar::Util) >= 1.20
+Requires:       perl(Sub::Identify) >= 0.03
 
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+%{?perl_default_filter:
+%filter_from_provides /perl(UNIVERSAL)/d; /perl(DB)/d
+%perl_default_filter
+}
 
 %description
 When subclassing a class, you occasionally want to dispatch control to the
 superclass -- at least conditionally and temporarily.   This module provides
-an easier, cleaner way for class methods to access their ancestor's 
+an easier, cleaner way for class methods to access their ancestor's
 implementation.
 
 %prep
@@ -55,6 +58,43 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Sun Jun 19 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1.17-5
+- Perl mass rebuild
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Dec 22 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.17-3
+- 661697 rebuild for fixing problems with vendorach/lib
+
+* Thu May 06 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.17-2
+- Mass rebuild with perl-5.12.0
+
+* Sun Sep 27 2009 Chris Weyl <cweyl@alumni.drew.edu> 1.17-1
+- update filtering
+- auto-update to 1.17 (by cpan-spec-update 0.01)
+- added a new br on perl(Scalar::Util) (version 1.20)
+- altered br on perl(Sub::Identify) (0 => 0.03)
+- altered br on perl(Test::Simple) (0 => 0.61)
+- added a new req on perl(Scalar::Util) (version 1.20)
+- added a new req on perl(Sub::Identify) (version 0.03)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.16-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.16-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Mar 04 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.16-3
+- rebuild for new perl
+
+* Wed Jan 02 2008 Ralf Corsépius <rc040203@freenet.de> 1.16-2
+- Adjust License-tag.
+- BR: perl(Test::Simple) (BZ 419631).
+
 * Wed Apr 04 2007 Chris Weyl <cweyl@alumni.drew.edu> 1.16-1
 - update to 1.16
 

sources

@@ -1 +1 @@
-3a0584598514f471f5df9480e12573c0  SUPER-1.16.tar.gz
+aa54aa7e9148c368091e34559587f3b2  SUPER-1.17.tar.gz