commit fb0d20eeca1ea7d23e5cf19b6b472abab57347f8
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date: Tue Oct 1 12:47:52 2013 +0100
Update to 2.4.6
- New upstream release 2.4.6
- Corrections to imagemap production in Composite.pm and Lines.pm
- The brush styles to points and linespoints are extended: not only circles
represent the points but a number of different brush styles, linke donut,
Star and so on
- Typo in _draw_x_ticks corrected
- Methods scalar_png(), scalar_jpeg() corrected for result
- Test routine t/scalarImage.t added
- Chart.pod corrected
- Documentation.pdf explains the use of colors (appendix added)
- Corrections in base.pm, routines _draw_bottom_legends, _draw_x_number_ticks
- Corrections in LinesPoints.pm, routine _draw_data
- Add patch for warnings in Perl 5.16+ (CPAN RT#79658)
- Drop %defattr, redundant since rpm 4.4
- Don't need to remove empty directories from the buildroot
- Use DESTDIR rather than PERL_INSTALL_ROOT
.gitignore | 3 +-
Chart-2.4.6-rt79658.patch | 25 ++++++++++++++++++++++++
perl-Chart.spec | 46 +++++++++++++++++++++++++++++++-------------
sources | 2 +-
4 files changed, 59 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bc598c6..cb96a31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-Chart-2.4.1.tar.gz
-/Chart-2.4.2.tar.gz
+/Chart-[0-9.]*.tar.gz
diff --git a/Chart-2.4.6-rt79658.patch b/Chart-2.4.6-rt79658.patch
new file mode 100644
index 0000000..5a988ba
--- /dev/null
+++ b/Chart-2.4.6-rt79658.patch
@@ -0,0 +1,25 @@
+When using Chart::Base with Perl 5.16.1, we get:
+
+ defined(@array) is deprecated at lib/Chart/Base.pm line 181. (Maybe you should just omit the defined()?)
+ defined(@array) is deprecated at lib/Chart/Base.pm line 233. (Maybe you should just omit the defined()?)
+
+--- Chart/Base.pm
++++ Chart/Base.pm
+@@ -178,7 +178,7 @@ sub add_pt
+ if ( ( ref $_[0] ) =~ /^ARRAY/ )
+ {
+ my $rdata = shift;
+- @data = @$rdata if defined @$rdata;
++ @data = @$rdata if @$rdata;
+ }
+ elsif ( ( ref \$_[0] ) =~ /^SCALAR/ )
+ {
+@@ -230,7 +230,7 @@ sub add_dataset
+ if ( ( ref $_[0] ) =~ /^ARRAY/ )
+ {
+ my $rdata = shift;
+- @data = @$rdata if defined @$rdata;
++ @data = @$rdata if @$rdata;
+ }
+ elsif ( ( ref \$_[0] ) =~ /^SCALAR/ )
+ {
diff --git a/perl-Chart.spec b/perl-Chart.spec
index 9d0806e..ac3752b 100644
--- a/perl-Chart.spec
+++ b/perl-Chart.spec
@@ -1,16 +1,17 @@
Name: perl-Chart
-Version: 2.4.2
-Release: 10%{?dist}
+Version: 2.4.6
+Release: 1%{?dist}
Summary: Series of charting modules
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Chart/
Source0: http://www.cpan.org/authors/id/C/CH/CHARTGRP/Chart-%{version}.tar.gz
+Patch0: Chart-2.4.6-rt79658.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(GD)
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description
This module is an attempt to build a general purpose graphing module that
@@ -19,6 +20,10 @@ all of its graphics primitives calls.
%prep
%setup -q -n Chart-%{version}
+
+# Fix for warnings in Perl 5.16+ (CPAN RT#79658)
+%patch0
+
chmod -c 644 Chart/*.pm TODO Documentation.pdf
rm -f pm_to_blib
@@ -28,13 +33,9 @@ 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 -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT
%check
rm -rf t/{mountain.t,mountain_2.t}
@@ -44,12 +45,29 @@ make test
rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root,-)
%doc README TODO Documentation.pdf
%{perl_vendorlib}/Chart*
%{_mandir}/man3/Chart.3*
%changelog
+* Tue Oct 1 2013 Paul Howarth <paul@xxxxxxxxxxxx> - 2.4.6-1
+- Update to 2.4.6
+ - Corrections to imagemap production in Composite.pm and Lines.pm
+ - The brush styles to points and linespoints are extended: not only circles
+ represent the points but a number of different brush styles, linke donut,
+ Star and so on
+ - Typo in _draw_x_ticks corrected
+ - Methods scalar_png(), scalar_jpeg() corrected for result
+ - Test routine t/scalarImage.t added
+ - Chart.pod corrected
+ - Documentation.pdf explains the use of colors (appendix added)
+ - Corrections in base.pm, routines _draw_bottom_legends, _draw_x_number_ticks
+ - Corrections in LinesPoints.pm, routine _draw_data
+- Add patch for warnings in Perl 5.16+ (CPAN RT#79658)
+- Drop %%defattr, redundant since rpm 4.4
+- Don't need to remove empty directories from the buildroot
+- Use DESTDIR rather than PERL_INSTALL_ROOT
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 2.4.2-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@@ -75,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Wed Dec 15 2010 Marcela Maslanova <mmaslano@xxxxxxxxxx> - 2.4.2-2
-- 661697 rebuild for fixing problems with vendorach/lib
+- Rebuild to fix problems with vendorarch/lib (#661697)
* Sun Dec 12 2010 Steven Pritchard <steve@xxxxxxxxx> 2.4.2-1
- Update to 2.4.2.
@@ -104,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT
- BR ExtUtils::MakeMaker.
- Minor spec cleanup to more closely resemble cpanspec output.
-* Mon Aug 27 2006 Michael J. Knox <michael[AT]knox.net.nz> - 2.4.1-4
+* Mon Aug 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 2.4.1-4
- Rebuild for FC6
* Mon May 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 2.4.1-3
@@ -115,8 +133,8 @@ rm -rf $RPM_BUILD_ROOT
- Don't ship rgb.txt in docs.
- Specfile cleanups.
-* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.3-3
-- rebuilt
+* Wed Apr 6 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.3-3
+- Rebuilt
* Sun Jul 11 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-2
- Bring up to date with current fedora.us Perl Spec template.
diff --git a/sources b/sources
index 1b823dc..80f3944 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a75183d33b58f77e2e717165b93dbf79 Chart-2.4.2.tar.gz
+dfcd2b72c56491aa7fc45cd18236de70 Chart-2.4.6.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
