[perl-File-MMagic-XS] Clean up and fix FTBFS (#914283)

[Paul Howarth]

commit 87133df885fdeca1aa884372b2e86312714793eb
Author: Paul Howarth <paul at city-fan.org>
Date:   Mon Feb 25 10:57:19 2013 +0000

    Clean up and fix FTBFS (#914283)
    
    - BR: perl(ExtUtils::MakeMaker) to fix FTBFS (#914283)
    - BR:/R: perl(File::Spec)
    - BR: perl(XSLoader)
    - Don't use macros for commands
    - Don't need to remove empty directories from the buildroot
    - Drop %defattr, redundant since rpm 4.4
    - Drop filter for unversioned provides, no longer needed
    - Use %{_fixperms} macro rather than our own chmod incantation
    - Use DESTDIR rather than PERL_INSTALL_ROOT
    - Add %{?perl_default_filter} to remove unwanted shared object provides

 perl-File-MMagic-XS.spec |   54 +++++++++++++++++++++++++++------------------
 1 files changed, 32 insertions(+), 22 deletions(-)
---
diff --git a/perl-File-MMagic-XS.spec b/perl-File-MMagic-XS.spec
index ef8fa7f..c477b16 100644
--- a/perl-File-MMagic-XS.spec
+++ b/perl-File-MMagic-XS.spec
@@ -1,15 +1,24 @@
 Name:           perl-File-MMagic-XS
 Version:        0.09006
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Guess file type with XS
 Group:          Development/Libraries
 License:        ASL 2.0 and (GPL+ or Artistic)
 URL:            http://search.cpan.org/dist/File-MMagic-XS
 Source0:        http://search.cpan.org/CPAN/authors/id/D/DM/DMAKI/File-MMagic-XS-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  perl(File::MMagic), gdbm-devel, perl(Test::More)
-Requires:  perl(File::MMagic)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
+BuildRequires:  gdbm-devel
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(File::MMagic)
+BuildRequires:  perl(File::Spec)
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(XSLoader)
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+Requires:       perl(File::MMagic)
+Requires:       perl(File::Spec)
+
+# Avoid unwanted shared object provides
+%{?perl_default_filter}
 
 %description
 This is a port of Apache2 mod_mime_magic.c in Perl, written in XS with the aim 
@@ -19,25 +28,16 @@ an extended amount of time.
 %prep
 %setup -q -n File-MMagic-XS-%{version}
 
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-    sed -e '/^perl(File::MMagic::XS)$/d'
-EOF
-%define __perl_provides %{_builddir}/File-MMagic-XS-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+make pure_install DESTDIR=$RPM_BUILD_ROOT
 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/*
+%{_fixperms} $RPM_BUILD_ROOT
 
 %check
 make test
@@ -46,14 +46,24 @@ make test
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
 %doc Changes
 %{perl_vendorarch}/auto/File/
 %{perl_vendorarch}/File/
-%{_mandir}/man3/*
-
+%{_mandir}/man3/File::MMagic::XS.3pm*
 
 %changelog
+* Mon Feb 25 2013 Paul Howarth <paul at city-fan.org> - 0.09006-11
+- BR: perl(ExtUtils::MakeMaker) to fix FTBFS (#914283)
+- BR:/R: perl(File::Spec)
+- BR: perl(XSLoader)
+- Don't use macros for commands
+- Don't need to remove empty directories from the buildroot
+- Drop %%defattr, redundant since rpm 4.4
+- Drop filter for unversioned provides, no longer needed
+- Use %%{_fixperms} macro rather than our own chmod incantation
+- Use DESTDIR rather than PERL_INSTALL_ROOT
+- Add %%{?perl_default_filter} to remove unwanted shared object provides
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09006-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -79,7 +89,7 @@ rm -rf $RPM_BUILD_ROOT
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Thu Dec 16 2010 Marcela Maslanova <mmaslano at redhat.com> - 0.09006-2
-- 661697 rebuild for fixing problems with vendorach/lib
+- Rebuild to fix problems with vendorarch/lib (#661697)
 
 * Mon Jul 12 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.09006-1
 - update to 0.09006
@@ -108,7 +118,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Dec 17 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.09003-1
 - bump to 0.09003
 
-* Sun Aug 27 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.09002-2
+* Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.09002-2
 - license tag fix
 - rebuild in devel for ppc32