[packages/perl-Cairo] - updated to 1.103 - removed obsolete tests patch - separated devel files

qboosh qboosh at pld-linux.org
Sun Jun 23 08:47:31 CEST 2013


commit bfd1fecf659f4258a2b2d2539efb2d19b0a1c95f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jun 23 08:46:57 2013 +0200

    - updated to 1.103
    - removed obsolete tests patch
    - separated devel files

 perl-Cairo-tests.patch | 92 --------------------------------------------------
 perl-Cairo.spec        | 30 +++++++++++-----
 2 files changed, 22 insertions(+), 100 deletions(-)
---
diff --git a/perl-Cairo.spec b/perl-Cairo.spec
index 758d79b..e892bcc 100644
--- a/perl-Cairo.spec
+++ b/perl-Cairo.spec
@@ -7,15 +7,14 @@
 Summary:	Perl Cairo bindings
 Summary(pl.UTF-8):	Wiązania Cairo dla Perla
 Name:		perl-Cairo
-Version:	1.082
-Release:	2
+Version:	1.103
+Release:	1
 License:	LGPL v2.1+
 Group:		Development/Languages/Perl
 Source0:	http://downloads.sourceforge.net/gtk2-perl/%{pnam}-%{version}.tar.gz
-# Source0-md5:	cfd61e519ff20023979c255d4040fe06
-Patch0:		%{name}-tests.patch
+# Source0-md5:	c693e5535ed60283c068d92120412f98
 URL:		http://gtk2-perl.sourceforge.net/
-BuildRequires:	cairo-devel >= 1.6.0
+BuildRequires:	cairo-devel >= 1.10.0
 BuildRequires:	perl-ExtUtils-Depends >= 0.201
 BuildRequires:	perl-ExtUtils-PkgConfig >= 1.06
 BuildRequires:	perl-devel >= 1:5.8.0
@@ -23,7 +22,7 @@ BuildRequires:	rpm-perlprov >= 4.1-13
 %if %{with tests}
 BuildRequires:	perl-Test-Number-Delta >= 1.0
 %endif
-Requires:	cairo >= 1.6.0
+Requires:	cairo >= 1.10.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -32,9 +31,21 @@ This module provides perl access to Cairo library.
 %description -l pl.UTF-8
 Ten moduł daje dostęp z poziomu Perla do biblioteki Cairo.
 
+%package devel
+Summary:	Development files for Perl Cairo bindings
+Summary(pl.UTF-8):	Pliki programistyczne wiązań Cairo dla Perla
+Group:		Development/Languages/Perl
+Requires:	%{name} = %{version}-%{release}
+Requires:	cairo-devel >= 1.10.0
+
+%description devel
+Development files for Perl Cairo bindings.
+
+%description devel -l pl.UTF-8
+Pliki programistyczne wiązań Cairo dla Perla.
+
 %prep
 %setup -q -n %{pnam}-%{version}
-%patch0 -p1
 
 %build
 %{__perl} Makefile.PL \
@@ -62,8 +73,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc NEWS README TODO
 %{perl_vendorarch}/Cairo.pm
 %dir %{perl_vendorarch}/Cairo
-%{perl_vendorarch}/Cairo/Install
 %dir %{perl_vendorarch}/auto/Cairo
 %attr(755,root,root) %{perl_vendorarch}/auto/Cairo/Cairo.so
 %{perl_vendorarch}/auto/Cairo/Cairo.bs
 %{_mandir}/man3/Cairo.3pm*
+
+%files devel
+%defattr(644,root,root,755)
+%{perl_vendorarch}/Cairo/Install
diff --git a/perl-Cairo-tests.patch b/perl-Cairo-tests.patch
deleted file mode 100644
index ab9cf94..0000000
--- a/perl-Cairo-tests.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From a1cd2e45b4ee49a724ae5d7e854ad9829eebf00d Mon Sep 17 00:00:00 2001
-From: Torsten Schönfeld <kaffeetisch at gmx.de>
-Date: Sat, 07 Apr 2012 18:01:31 +0000
-Subject: Make t/CairoPath.t more robust
-
-The end of a path that took a round trip into cairo and back might differ
-for different versions of cairo.  Hence, compare only the beginning with
-the expected path.
----
-diff --git a/t/CairoPath.t b/t/CairoPath.t
-index 770e464..27a3aad 100644
---- a/t/CairoPath.t
-+++ b/t/CairoPath.t
-@@ -11,7 +11,7 @@ use strict;
- use warnings;
- use Cairo;
- 
--use Test::More tests => 6;
-+use Test::More tests => 18;
- 
- use constant IMG_WIDTH => 256;
- use constant IMG_HEIGHT => 256;
-@@ -40,14 +34,7 @@ my $expected_path = [
- ];
- 
- my $path = $cr->copy_path;
--is_deeply ($path, $expected_path);
--
--sub paths_agree {
--  my ($cr, $path, $expected_path) = @_;
--  $cr->new_path;
--  $cr->append_path ($path);
--  is_deeply ($cr->copy_path, $expected_path);
--}
-+paths_agree ($path, $expected_path);
- 
- # Modifying single point values.
- foreach ($path, $expected_path) {
-@@ -57,21 +44,21 @@ foreach ($path, $expected_path) {
-   $_->[2]{points}[2][0] = 99;
-   $_->[2]{points}[2][1] = 1010;
- }
--paths_agree ($cr, $path, $expected_path);
-+path_round_trip_ok ($cr, $path, $expected_path);
- 
- # Modifying single points.
- foreach ($path, $expected_path) {
-   $_->[1]{points}[0] = [333, 444];
-   $_->[2]{points}[2] = [77, 88];
- }
--paths_agree ($cr, $path, $expected_path);
-+path_round_trip_ok ($cr, $path, $expected_path);
- 
- # Replacing all points.
- foreach ($path, $expected_path) {
-   $_->[1]{points} = [[3333, 4444]];
-   $_->[2]{points} = [[55, 66], [77, 88], [99, 1010]];
- }
--paths_agree ($cr, $path, $expected_path);
-+path_round_trip_ok ($cr, $path, $expected_path);
- 
- # Replacing and adding path segments.
- my @cloned_path = @{$path};
-@@ -86,9 +73,24 @@ foreach (\@cloned_path, $expected_path) {
-     type => 'line-to',
-     points => [[23, 42]] };
- }
--paths_agree ($cr, \@cloned_path, $expected_path);
-+path_round_trip_ok ($cr, \@cloned_path, $expected_path);
- 
- # Passing bare arrays into Cairo.
- $cr->new_path;
- $cr->append_path ($expected_path);
--is_deeply ($cr->copy_path, $expected_path);
-+paths_agree ($cr->copy_path, $expected_path);
-+
-+sub path_round_trip_ok {
-+  my ($cr, $path, $expected_path) = @_;
-+  $cr->new_path;
-+  $cr->append_path ($path);
-+  paths_agree ($cr->copy_path, $expected_path);
-+}
-+
-+sub paths_agree {
-+  my ($path, $expected_path) = @_;
-+  # Only the first three entries seem to be reliable across cairo versions.
-+  for (0..2) {
-+    is_deeply ($path->[$_], $expected_path->[$_]);
-+  }
-+}
---
-cgit v0.9.0.2
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/perl-Cairo.git/commitdiff/bfd1fecf659f4258a2b2d2539efb2d19b0a1c95f



More information about the pld-cvs-commit mailing list