Merge branch 'master' into el4

Conflicts:
	.gitignore

.gitignore

@@ -1 +1,2 @@
-Sub-Name-0.02.tar.gz
+Sub-Name-0.04.tar.gz
+/Sub-Name-0.05.tar.gz

perl-Sub-Name.spec

@@ -1,14 +1,22 @@
 Name:           perl-Sub-Name
-Version:        0.02
-Release:        2%{?dist}
+Version:        0.05
+Release:        5%{?dist}
 Summary:        Name -- or rename -- a sub
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Sub-Name/
-Source0:        http://www.cpan.org/authors/id/X/XM/XMATH/Sub-Name-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Sub-Name-%{version}.tar.gz
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Test::More)
+
+# use base
+Requires:       perl(Exporter)
+Requires:       perl(DynaLoader)
+
+%{?perl_default_filter}
+
 %description
 This module allows one to "name" or rename subroutines, including anonymous
 ones.
@@ -25,12 +33,10 @@ by the new name (w/o some deep magic).
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-
 make pure_install PERL_INSTALL_ROOT=%{buildroot}
 
-find %{buildroot} -type f -name .packlist -exec rm -f {} \;
-find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
+find %{buildroot} -type f -name .packlist -exec rm -f {} +
+find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} +
 find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
 
 %{_fixperms} %{buildroot}/*
@@ -38,9 +44,6 @@ find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
 %check
 make test
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %doc Changes README
@@ -49,6 +52,58 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.05-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Fri Jun 17 2011 Marcela Mašláňová <mmaslano@redhat.com> - 0.05-4
+- Perl mass rebuild
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.05-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Dec 22 2010 Marcela Maslanova <mmaslano@redhat.com> - 0.05-2
+- 661697 rebuild for fixing problems with vendorach/lib
+
+* Sat Dec 18 2010 Iain Arnell <iarnell@gmail.com> 0.05-1
+- update to latest upstream version
+- clean up spec for modern rpmbuild
+- BR perl(Test::More)
+- Requires perl(DynaLoader) and perl(Exporter)
+
+* Thu May 06 2010 Marcela Maslanova <mmaslano@redhat.com> - 0.04-6
+- Mass rebuild with perl-5.12.0
+
+* Mon Dec  7 2009 Stepan Kasal <skasal@redhat.com> - 0.04-5
+- rebuild against perl 5.10.1
+
+* Thu Aug 27 2009 Chris Weyl <cweyl@alumni.drew.edu> - 0.04-4
+- Filtering errant private provides
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.04-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.04-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Aug 03 2008 Chris Weyl <cweyl@alumni.drew.edu> 0.04-1
+- update to 0.04
+
+* Sat Mar 15 2008 Chris Weyl <cweyl@alumni.drew.edu> 0.03-1
+- update to 0.03
+
+* Tue Mar  4 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.02-5
+- rebuild for new perl
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.02-4.1
+- Autorebuild for GCC 4.3
+
+* Tue Oct 16 2007 Tom "spot" Callaway <tcallawa@redhat.com> 0.02-3.1
+- correct license tag
+- add BR: perl(ExtUtils::MakeMaker)
+
+* Tue Aug 21 2007 Chris Weyl <cweyl@alumni.drew.edu> 0.02-3
+- bump
+
 * Wed Sep 06 2006 Chris Weyl <cweyl@alumni.drew.edu> 0.02-2
 - bump
 

sources

@@ -1 +1 @@
-a47e1f1fe88a0c85b7ecc0d150039616  Sub-Name-0.02.tar.gz
+26077202597620e4a6068c8087f3e09f  Sub-Name-0.05.tar.gz