Merge branch 'master' into el6

Conflicts:
	perl-Test-Distribution.spec

perl-Test-Distribution.spec

@@ -1,6 +1,9 @@
+# noarch, but to avoid debug*.list interfering with signature/manifest tests:
+%define debug_package %{nil}
+
 Name:           perl-Test-Distribution
 Version:        2.00
-Release:        7%{?dist}
+Release:        10%{?dist}
 Summary:        Perform tests on all modules of a distribution
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -12,6 +15,7 @@ BuildArch:      noarch
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(File::Find::Rule) >= 0.03
 BuildRequires:  perl(Module::CoreList) >= 1.93
+BuildRequires:  perl(Module::Signature)
 BuildRequires:  perl(Pod::Coverage) >= 0.17
 BuildRequires:  perl(Test::Pod) >= 0.95
 BuildRequires:  perl(Test::Pod::Coverage)
@@ -28,17 +32,12 @@ Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi
 
 %description
 When using this module in a test script, it goes through all the modules in
-your distribution, checks their POD, checks that they compile OK and checks
+your distribution, checks their POD, checks that they compile ok and checks
 that they all define a $VERSION.
 
 %prep
 %setup -q -n Test-Distribution-%{version}
 
-for f in README Changes.pod; do
-  /usr/bin/iconv -f iso-8859-1 -t utf-8 < ${f} > ${f}.utf8
-  mv ${f}.utf8 ${f}
-done
-
 %build
 %{__perl} Build.PL installdirs=vendor
 ./Build
@@ -47,13 +46,17 @@ done
 rm -rf %{buildroot}
 
 ./Build install destdir=%{buildroot} create_packlist=0
-find %{buildroot} -depth -type d -exec rmdir {} \; 2>/dev/null
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
 
-%{_fixperms} %{buildroot}
+%{_fixperms} %{buildroot}/*
 
 
 %check
-LC_ALL=C ./Build test
+# appease Module::Signature
+tmpdir=$(mktemp -d %{_tmppath}/%{name}-%{version}-%{release}.XXXXXX)
+mkdir -m 700 $tmpdir/_gnupg
+export GNUPGHOME=$tmpdir/_gnupg
+./Build test && rm -rf $tmpdir
 
 %clean
 rm -rf %{buildroot}
@@ -61,16 +64,21 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc Changes.pod README
-%{perl_vendorlib}/Test/
-%{_mandir}/man3/Test::Distribution.3pm*
+%{perl_vendorlib}/*
+%{_mandir}/man3/*
 
 %changelog
-* Tue May 18 2010 Paul Howarth <paul@city-fan.org> - 2.00-7
-- No signature test, so Module::Signature not needed as buildreq, and no need
-  to go to great lengths to avoid clobbering ~/.gnupg
-- Recode README and Changes.pod as UTF8
-- Run tests in "C" locale to avoid Module::Build's inability to find perl
-  in the test suite on older distributions
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.00-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Fri Jun 24 2011 Marcela Mašláňová <mmaslano@redhat.com> - 2.00-9
+- Perl mass rebuild
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.00-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Dec 22 2010 Marcela Maslanova <mmaslano@redhat.com> - 2.00-7
+- 661697 rebuild for fixing problems with vendorach/lib
 
 * Thu May 06 2010 Marcela Maslanova <mmaslano@redhat.com> - 2.00-6
 - Mass rebuild with perl-5.12.0