From c187e076e2e2795b5875a719314c42d4fe6bf44c57239b26b7b85f7ab5dbab99 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Sun, 1 May 2011 10:30:27 +0000
Subject: [PATCH] Accepting request 68657 from
 home:vitezslav_cizek:branches:devel:languages:perl

- license correction (same as Perl)
- added new dependencies (bnc#676080)
- spec renewal

OBS-URL: https://build.opensuse.org/request/show/68657
OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-GDGraph?expand=0&rev=9
---
 perl-GDGraph.changes |  7 +++++++
 perl-GDGraph.spec    | 45 ++++++++++++++++++++++----------------------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/perl-GDGraph.changes b/perl-GDGraph.changes
index a666567..b6322b1 100644
--- a/perl-GDGraph.changes
+++ b/perl-GDGraph.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr 28 09:15:17 UTC 2011 - vcizek@novell.com
+
+- license correction (same as Perl)
+- added new dependencies (bnc#676080)
+- spec renewal
+
 -------------------------------------------------------------------
 Wed Dec  1 06:55:37 UTC 2010 - coolo@novell.com
 
diff --git a/perl-GDGraph.spec b/perl-GDGraph.spec
index dfd0bf0..7c0c9f1 100644
--- a/perl-GDGraph.spec
+++ b/perl-GDGraph.spec
@@ -19,18 +19,25 @@
 
 
 Name:           perl-GDGraph
-BuildRequires:  ImageMagick libtiff-devel perl-GD perl-GDTextUtil xorg-x11-devel
-BuildRequires:  perl-macros
+%define cpan_name GDGraph
 Version:        1.44
 Release:        183
 AutoReqProv:    on
 Group:          Development/Libraries/Perl
-License:        Artistic
+License:        GPL+ or Artistic
 Url:            http://cpan.org/modules/by-module/GD/
-Summary:        package to generate charts, using Lincoln Stein's GD.pm
-Source:         GDGraph-%{version}.tar.bz2
-Patch:          GDGraph-trim_miter.diff
+Summary:        Package to generate charts, using Lincoln Stein's GD.pm
+BuildRequires:  ImageMagick libtiff-devel xorg-x11-devel
+BuildRequires:  perl(GD) >= 1.18
+BuildRequires:  perl(GD::Text) >= 0.80
+BuildRequires:  perl
+BuildRequires:  perl-macros
+Requires:       perl(GD) >= 1.18
+Requires:       perl(GD::Text) >= 0.80
+Source:         %{cpan_name}-%{version}.tar.bz2
+Patch:          %{cpan_name}-trim_miter.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 %{perl_requires}
 
 %description
@@ -38,34 +45,28 @@ This is GDGraph, a package to generate charts, using Lincoln Stein's
 GD.pm. See the documentation for some history and more information.
 
 
-
-Authors:
---------
-    Martien Verbruggen <mgjv@tradingpost.com.au>
-
 %prep
-%setup -n GDGraph-%{version}
+%setup -n %{cpan_name}-%{version}
 %patch -p1
 
 %build
-perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS -Wall"
-make %{?_smp_mflags}
-make test
-make samples
+%{__perl} Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS -Wall" INSTALLDIRS=vendor
+%{__make} %{?_smp_mflags}
+%{__make} samples
+
+%check
+%{__make} test
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install_vendor
+%perl_make_install
 %perl_process_packlist
+%perl_gen_filelist
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.files
 %defattr(-, root, root)
 %doc README*
-%doc %{_mandir}/man?/*
-%{perl_vendorarch}/auto/GD/Graph
-%{perl_vendorlib}/GD
 
 %changelog