[php-pear-Image-Graph/f14/master] update to 0.8.0

[Remi Collet]

commit cd4658e36419255fd847ccd236bfcdbd7993d73b
Author: remi <fedora at famillecollet.com>
Date:   Thu Oct 7 18:32:34 2010 +0200

    update to 0.8.0

 .gitignore                |    2 +
 php-pear-Image-Graph.spec |   64 +++++++++++++++++++++++++++++++--------------
 sources                   |    2 +-
 3 files changed, 47 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4f1b0b7..1f2d308 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 Image_Graph-0.7.2.tgz
 Image_Graph-0.7.3.tgz
+package.xml
+/Image_Graph-0.8.0.tgz
diff --git a/php-pear-Image-Graph.spec b/php-pear-Image-Graph.spec
index b327a7c..06c088f 100644
--- a/php-pear-Image-Graph.spec
+++ b/php-pear-Image-Graph.spec
@@ -1,35 +1,36 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name Image_Graph
 
-%global svn 291756
 Name:           php-pear-Image-Graph
-Version:        0.7.3
+Summary:        Displays numerical data as a graph/chart/plot
+Version:        0.8.0
 %if 0%{?svn}
 Release:        0.1.svn%{svn}%{?dist}
 # svn export -r 291756 http://svn.php.net/repository/pear/packages/Image_Graph/trunk
 # cd trunk;  pear package package.xml
 Source0:        %{pear_name}-%{version}.tgz
 %else
-Release:        6%{?dist}
+Release:        1%{?dist}
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 %endif
-Summary:        Displays numerical data as a graph/chart/plot
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://pear.php.net/package/Image_Graph
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
+
 Requires:       php-pear(PEAR)
 Requires:       php-pear(Image_Canvas) >= 0.3.0
 Requires:       php-pear(Numbers_Roman)
 Requires:       php-pear(Numbers_Words)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Provides:       php-pear(%{pear_name}) = %{version}
+# Test Requires: gnu-free-sans-fonts
 
+Provides:       php-pear(%{pear_name}) = %{version}
 Provides:       php-pear-Image-Graph-roman = %{version}-%{release}
 Provides:       php-pear-Image-Graph-words = %{version}-%{release}
 Obsoletes:      php-pear-Image-Graph-roman < %{version}-%{release}
@@ -53,9 +54,14 @@ PDF (using PDFLib), Scalable Vector Graphics (SVG).
 
 %prep
 %setup -qc
-# Package.xml is V2
-mv package.xml %{pear_name}-%{version}/%{name}.xml
+
+# Create a "localized" php.ini to avoid build warning
+cp /etc/php.ini .
+echo "date.timezone=UTC" >>php.ini
+
 cd %{pear_name}-%{version}
+# package.xml is V2
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -64,30 +70,41 @@ cd %{pear_name}-%{version}
 
 
 %install
+%{__rm} -rf $RPM_BUILD_ROOT docdir
 cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Move documentation
-mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/docs ../docdir
 
 # Clean up files
-find docdir -type f -exec sed -i 's/\r//' {} \;
-for file in $(find docdir -type f -name "*.php") ; do
+find ../docdir -type f -exec %{__sed} -i -e 's/\r//' {} \;
+for file in $(find ../docdir -type f -name '*.php') ; do
     iconv -f iso8859-1 -t utf-8 $file > $file.conv && mv -f $file.conv $file
 done
+# Fix font
+find $RPM_BUILD_ROOT%{pear_testdir}/%{pear_name}/tests \
+    -type f -name '*.php' \
+    -exec %{__sed} -i -e "s@'Verdana'@'/usr/share/fonts/gnu-free/FreeSans.ttf'@" {} \;
+
+%{__sed} -i -e 's at c:/windows/fonts/Arial.ttf@/usr/share/fonts/gnu-free/FreeSans.ttf@' \
+    $RPM_BUILD_ROOT%{pear_testdir}/%{pear_name}/tests/freetype.php
+
 
 # Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+%{__rm} -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-install -d $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+%{__install} -d $RPM_BUILD_ROOT%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+
+
+%check
+# The tests provided are not unit or regression tests.
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 
 %post
@@ -103,14 +120,21 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/*
+%doc docdir/*
 %{pear_xmldir}/%{name}.xml
 %{pear_testdir}/%{pear_name}
 %{pear_phpdir}/Image/Graph*
+%exclude %{pear_datadir}/%{pear_name} 
 
 
 %changelog
-* Sun Aug 15 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.3-0.1.svn291756
+* Thu Oct 07 2010 Remi Collet <fedora at famillecollet.com> - 0.8.0-1
+- upstream Version 0.8.0 (alpha) - API 0.8.0 (alpha)
+  but most changes already in previous SVN snapshot
+- set timezone during build
+- use FreeSans.ttf in tests provided
+
+* Sun Aug 15 2010 Remi Collet <fedora at famillecollet.com> - 0.7.3-0.1.svn291756
 - update to SVN snapshot to fix PHP 5.3 issues (#547738)
 - rename Image_Graph.xml to php-pear-Image-Graph.xml
 
diff --git a/sources b/sources
index db416b9..6c371a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-effdb9de58e492822a9cb6fabfc6c39f  Image_Graph-0.7.3.tgz
+8755a8a86b4fd0fe8aa0bc13ed98f598  Image_Graph-0.8.0.tgz