diff --git a/.gitignore b/.gitignore index 6e5ba8c..f0917d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -Spreadsheet-ParseExcel-0.49.tar.gz +/Spreadsheet-ParseExcel-[0-9.]*.tar.gz diff --git a/perl-Spreadsheet-ParseExcel.spec b/perl-Spreadsheet-ParseExcel.spec index 6340c53..2f73ed8 100644 --- a/perl-Spreadsheet-ParseExcel.spec +++ b/perl-Spreadsheet-ParseExcel.spec @@ -2,25 +2,29 @@ %define debug_package %{nil} # Avoid Epoch inflation -%define module_version 0.49 +%define module_version 0.55 Name: perl-Spreadsheet-ParseExcel -Version: 0.4900 -Release: 3%{?dist} +Version: 0.5500 +Release: 1%{?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) -BuildRequires: perl(Test::More) >= 0.47 -BuildRequires: perl(Test::Pod) >= 1.00 +BuildRequires: perl(Test::CPAN::Meta) +%if 0%{?fedora} || 0%{?rhel} > 5 +BuildRequires: perl(Test::MinimumVersion) +%endif +BuildRequires: perl(Test::More) +BuildRequires: perl(Test::Pod) BuildRequires: perl(Unicode::Map) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -31,39 +35,114 @@ Excel 95-2003 file. %prep %setup -q -n Spreadsheet-ParseExcel-%{module_version} -for file in README sample/* ; do +# 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 Changes 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 AUTOMATED_TESTING=1 %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 - 0.5500-1 +- Update to 0.55 + - Refactored Worksheet interface and documentation, adding 04_regression.t + and 05_regression.t to test changes + - Fixed column units conversion, adding 24_row_col_sizes.t as check + - Fixed RK number conversion, which was the source of several RT bugs and + portability issues; added 25_decode_rk_numbers.t test case + - Added fix for incorrectly skipped charts (CPAN RT#44009) + - Added fix for locale [$-ddd] strings in number formats (CPAN RT#43638) + - Added fix for multiple dots in number formats (CPAN RT#45502) + - Added fix to make half way rounding behave like Excel (CPAN RT#45626) + - Added checks for valid dates in Utility::ExcelFmt (CPAN RT#48831) + - Added new FmtJapan module and tests written by Goro Fuji + - Fixed bug in ExcelFmt() date handling where conversion to weekday and month + names wasn't handled correctly, adding extra tests to + 21_number_format_user.t + - Fixed bug when checking $Config{useperlio} (CPAN RT#28861) + - Fixed bug where CellHandler variables weren't scoped to package + (CPAN RT#43250) + - Added tests for ExcelLocaltime() and LocaltimeExcel(), + 26_localtime2excel.t and 27_localtime2excel.t + - Refactored SaveParser docs + - Made perl 5.8.0 a requirement for proper Unicode handling + - Fixed minor int2col() bug, adding 28_int2col.t test (CPAN RT#48967) + - Refactored Workbook API and docs + - Fix for height/width of hidden rows/columns with additional tests in + 05_regression.t (CPAN RT#48450) + - Fix for malformed Print_Title Name block + - Refactored Cell.pm documentation and method names and added regression + suite, t/06_regression.t + - Added float comparison test to avoid false failing tests on 64-bit systems +- Drop perl(Test::More) and perl(Test::Pod) version requirements +- BR: perl(Test::CPAN::Meta) and perl(Test::MinimumVersion), and enable + AUTOMATED_TESTING +- Fix line-endings of Changes file + +* Mon Aug 22 2011 Paul Howarth - 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 - 0.4900-9 +- Perl mass rebuild + +* Tue Jul 19 2011 Petr Sabata - 0.4900-8 +- Perl mass rebuild + +* Wed Feb 09 2011 Fedora Release Engineering - 0.4900-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Dec 22 2010 Marcela Maslanova - 0.4900-6 +- Rebuild to fix problems with vendorarch/lib (#661697) + +* Thu May 06 2010 Marcela Maslanova - 0.4900-5 +- Mass rebuild with perl-5.12.0 + +* Mon Dec 7 2009 Stepan Kasal - 0.4900-4 +- rebuild against perl 5.10.1 + * Sun Jul 26 2009 Fedora Release Engineering - 0.4900-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index d543dde..591d0d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -abc0f400d58b61f46c30a2f46db0ea46 Spreadsheet-ParseExcel-0.49.tar.gz +6c88512797bfa7f4065992e5c6369956 Spreadsheet-ParseExcel-0.55.tar.gz