From 0c089ed55de385893b30095e67a280e7febfb1dd Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Mon, 22 Aug 2011 13:11:09 +0100
Subject: [PATCH] Revert to ExtUtils::MakeMaker flow preferred by upstream

- Revert to ExtUtils::MakeMaker flow preferred by upstream
- Make %files list more explicit
- Add note about encoding of sample files
---
 perl-Spreadsheet-ParseExcel.spec | 57 ++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 18 deletions(-)

diff --git a/perl-Spreadsheet-ParseExcel.spec b/perl-Spreadsheet-ParseExcel.spec
index 7800051..bfc346e 100644
--- a/perl-Spreadsheet-ParseExcel.spec
+++ b/perl-Spreadsheet-ParseExcel.spec
@@ -6,16 +6,16 @@
 
 Name:           perl-Spreadsheet-ParseExcel
 Version:        0.4900
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Extract information from an Excel file
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Spreadsheet-ParseExcel/
 Source0:        http://www.cpan.org/authors/id/J/JM/JMCNAMARA/Spreadsheet-ParseExcel-%{module_version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(IO::Scalar)
 BuildRequires:  perl(Jcode)
-BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(OLE::Storage_Lite) >= 0.08
 BuildRequires:  perl(Proc::ProcessTable)
 BuildRequires:  perl(Spreadsheet::WriteExcel)
@@ -31,39 +31,60 @@ Excel 95-2003 file.
 %prep
 %setup -q -n Spreadsheet-ParseExcel-%{module_version}
 
+# Fix line-endings of sample files; note that some of them are explicitly
+# not UTF-8 encoded and thus rpmlint complaints about them are to be expected
 for file in README sample/* ; do
     [ -f "$file" ] && %{__perl} -pi -e 's/\r\n/\n/' "$file"
 done
 
 %build
-%{__perl} Build.PL installdirs=vendor
-./Build
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
+%{_fixperms} %{buildroot}
 
-./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-install -d $RPM_BUILD_ROOT%{perl_vendorarch}/Unicode/Map/MS/WIN
-install -m644 CP932Excel.map $RPM_BUILD_ROOT%{perl_vendorarch}/Unicode/Map/MS/WIN/
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+# For Spreadsheet::ParseExcel::FmtJapan2; see README for details
+install -D -m 644 -p CP932Excel.map \
+    %{buildroot}%{perl_vendorarch}/Unicode/Map/MS/WIN/CP932Excel.map
 
 %check
-./Build test
+make test
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %doc Changes README README_Japan.htm sample/
-%{perl_vendorarch}/Unicode
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%{perl_vendorarch}/Unicode/
+%{perl_vendorlib}/Spreadsheet/
+%{_mandir}/man3/Spreadsheet::ParseExcel.3pm*
+%{_mandir}/man3/Spreadsheet::ParseExcel::Cell.3pm*
+%{_mandir}/man3/Spreadsheet::ParseExcel::Dump.3pm*
+%{_mandir}/man3/Spreadsheet::ParseExcel::FmtDefault.3pm*
+%{_mandir}/man3/Spreadsheet::ParseExcel::FmtJapan.3pm*
+%{_mandir}/man3/Spreadsheet::ParseExcel::FmtJapan2.3pm*
+%{_mandir}/man3/Spreadsheet::ParseExcel::FmtUnicode.3pm*
+%{_mandir}/man3/Spreadsheet::ParseExcel::Font.3pm*
+%{_mandir}/man3/Spreadsheet::ParseExcel::Format.3pm*
+%{_mandir}/man3/Spreadsheet::ParseExcel::SaveParser.3pm*
+%{_mandir}/man3/Spreadsheet::ParseExcel::SaveParser::Workbook.3pm*
+%{_mandir}/man3/Spreadsheet::ParseExcel::SaveParser::Worksheet.3pm*
+%{_mandir}/man3/Spreadsheet::ParseExcel::Utility.3pm*
+%{_mandir}/man3/Spreadsheet::ParseExcel::Workbook.3pm*
+%{_mandir}/man3/Spreadsheet::ParseExcel::Worksheet.3pm*
 
 %changelog
+* Mon Aug 22 2011 Paul Howarth <paul@city-fan.org> - 0.4900-10
+- Revert to ExtUtils::MakeMaker flow preferred by upstream
+- Make %%files list more explicit
+- Add note about encoding of sample files
+
 * Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 0.4900-9
 - Perl mass rebuild
 
@@ -74,7 +95,7 @@ rm -rf $RPM_BUILD_ROOT
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Wed Dec 22 2010 Marcela Maslanova <mmaslano@redhat.com> - 0.4900-6
-- 661697 rebuild for fixing problems with vendorach/lib
+- Rebuild to fix problems with vendorarch/lib (#661697)
 
 * Thu May 06 2010 Marcela Maslanova <mmaslano@redhat.com> - 0.4900-5
 - Mass rebuild with perl-5.12.0