From 4d3df772922eecdcaedfa601f764cf18c3f3c1ff Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:31:19 +0000 Subject: [PATCH 01/10] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 73925cf..84d28eb 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: perl-Spreadsheet-ParseExcel -# $Id$ +# $Id: Makefile,v 1.1 2006/06/05 09:40:22 mpeters Exp $ NAME := perl-Spreadsheet-ParseExcel SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 4e8c16ccbf9f3f64d400ab18a9443085bf3ab782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Mon, 7 Dec 2009 03:25:36 +0000 Subject: [PATCH 02/10] - rebuild against perl 5.10.1 --- perl-Spreadsheet-ParseExcel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-Spreadsheet-ParseExcel.spec b/perl-Spreadsheet-ParseExcel.spec index 6340c53..5fb72e4 100644 --- a/perl-Spreadsheet-ParseExcel.spec +++ b/perl-Spreadsheet-ParseExcel.spec @@ -6,7 +6,7 @@ Name: perl-Spreadsheet-ParseExcel Version: 0.4900 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Extract information from an Excel file License: GPL+ or Artistic Group: Development/Libraries @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* 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 From 6dcc0d9e9612b3043f89a86c99308c54c756bede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Thu, 6 May 2010 13:06:48 +0000 Subject: [PATCH 03/10] - Mass rebuild with perl-5.12.0 --- perl-Spreadsheet-ParseExcel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-Spreadsheet-ParseExcel.spec b/perl-Spreadsheet-ParseExcel.spec index 5fb72e4..2ec8c11 100644 --- a/perl-Spreadsheet-ParseExcel.spec +++ b/perl-Spreadsheet-ParseExcel.spec @@ -6,7 +6,7 @@ Name: perl-Spreadsheet-ParseExcel Version: 0.4900 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Extract information from an Excel file License: GPL+ or Artistic Group: Development/Libraries @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* 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 From f39788cab56be1eb7c84a555445cad0bca62a94e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 07:58:05 +0000 Subject: [PATCH 04/10] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 84d28eb..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: perl-Spreadsheet-ParseExcel -# $Id: Makefile,v 1.1 2006/06/05 09:40:22 mpeters Exp $ -NAME := perl-Spreadsheet-ParseExcel -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 6aa85e582b8f7f752bfd84c0be375c81eba996b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Wed, 22 Dec 2010 10:50:56 +0100 Subject: [PATCH 05/10] - 661697 rebuild for fixing problems with vendorach/lib --- perl-Spreadsheet-ParseExcel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-Spreadsheet-ParseExcel.spec b/perl-Spreadsheet-ParseExcel.spec index 2ec8c11..e4411d6 100644 --- a/perl-Spreadsheet-ParseExcel.spec +++ b/perl-Spreadsheet-ParseExcel.spec @@ -6,7 +6,7 @@ Name: perl-Spreadsheet-ParseExcel Version: 0.4900 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Extract information from an Excel file License: GPL+ or Artistic Group: Development/Libraries @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Wed Dec 22 2010 Marcela Maslanova - 0.4900-6 +- 661697 rebuild for fixing problems with vendorach/lib + * Thu May 06 2010 Marcela Maslanova - 0.4900-5 - Mass rebuild with perl-5.12.0 From f5fc41019215477f0a5df355661f0dbce41c7d18 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 00:53:05 -0600 Subject: [PATCH 06/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- perl-Spreadsheet-ParseExcel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-Spreadsheet-ParseExcel.spec b/perl-Spreadsheet-ParseExcel.spec index e4411d6..6015a25 100644 --- a/perl-Spreadsheet-ParseExcel.spec +++ b/perl-Spreadsheet-ParseExcel.spec @@ -6,7 +6,7 @@ Name: perl-Spreadsheet-ParseExcel Version: 0.4900 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Extract information from an Excel file License: GPL+ or Artistic Group: Development/Libraries @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* 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 - 661697 rebuild for fixing problems with vendorach/lib From 4ae52292526491f771a7421c8c3c42dbbbae1a60 Mon Sep 17 00:00:00 2001 From: Petr Sabata Date: Tue, 19 Jul 2011 11:17:15 +0200 Subject: [PATCH 07/10] Perl mass rebuild --- perl-Spreadsheet-ParseExcel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-Spreadsheet-ParseExcel.spec b/perl-Spreadsheet-ParseExcel.spec index 6015a25..ca61cb7 100644 --- a/perl-Spreadsheet-ParseExcel.spec +++ b/perl-Spreadsheet-ParseExcel.spec @@ -6,7 +6,7 @@ Name: perl-Spreadsheet-ParseExcel Version: 0.4900 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Extract information from an Excel file License: GPL+ or Artistic Group: Development/Libraries @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* 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 From c12b02b6a2339a832d52b1bf053448af47422331 Mon Sep 17 00:00:00 2001 From: Petr Sabata Date: Thu, 21 Jul 2011 15:15:58 +0200 Subject: [PATCH 08/10] Perl mass rebuild --- perl-Spreadsheet-ParseExcel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-Spreadsheet-ParseExcel.spec b/perl-Spreadsheet-ParseExcel.spec index ca61cb7..7800051 100644 --- a/perl-Spreadsheet-ParseExcel.spec +++ b/perl-Spreadsheet-ParseExcel.spec @@ -6,7 +6,7 @@ Name: perl-Spreadsheet-ParseExcel Version: 0.4900 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Extract information from an Excel file License: GPL+ or Artistic Group: Development/Libraries @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Thu Jul 21 2011 Petr Sabata - 0.4900-9 +- Perl mass rebuild + * Tue Jul 19 2011 Petr Sabata - 0.4900-8 - Perl mass rebuild From 0c089ed55de385893b30095e67a280e7febfb1dd Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Mon, 22 Aug 2011 13:11:09 +0100 Subject: [PATCH 09/10] 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 - 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 @@ -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 - 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 - 0.4900-5 - Mass rebuild with perl-5.12.0 From d66f98448540f4325409a8677721a290ea46010d Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Mon, 22 Aug 2011 13:40:11 +0100 Subject: [PATCH 10/10] Update to 0.55 - New upstream release 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 --- .gitignore | 2 +- perl-Spreadsheet-ParseExcel.spec | 54 +++++++++++++++++++++++++++----- sources | 2 +- 3 files changed, 49 insertions(+), 9 deletions(-) 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 bfc346e..2f73ed8 100644 --- a/perl-Spreadsheet-ParseExcel.spec +++ b/perl-Spreadsheet-ParseExcel.spec @@ -2,11 +2,11 @@ %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: 10%{?dist} +Version: 0.5500 +Release: 1%{?dist} Summary: Extract information from an Excel file License: GPL+ or Artistic Group: Development/Libraries @@ -19,8 +19,12 @@ BuildRequires: perl(Jcode) 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)) @@ -33,7 +37,7 @@ Excel 95-2003 file. # 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 +for file in Changes README sample/* ; do [ -f "$file" ] && %{__perl} -pi -e 's/\r\n/\n/' "$file" done @@ -53,7 +57,7 @@ install -D -m 644 -p CP932Excel.map \ %{buildroot}%{perl_vendorarch}/Unicode/Map/MS/WIN/CP932Excel.map %check -make test +make test AUTOMATED_TESTING=1 %clean rm -rf %{buildroot} @@ -80,6 +84,42 @@ rm -rf %{buildroot} %{_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 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