[php-pear-Image-Canvas/el6/master] update to 0.3.3 - QA release

[Remi Collet]

commit dff5947da80b04316588e98cf6f5a4dcc80d8f91
Author: remi <fedora at famillecollet.com>
Date:   Thu Oct 28 14:39:16 2010 +0200

    update to 0.3.3 - QA release

 .gitignore                 |    2 ++
 php-pear-Image-Canvas.spec |   39 +++++++++++++++++++++++----------------
 sources                    |    2 +-
 3 files changed, 26 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c00ca92..f4de01d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 Image_Canvas-0.3.2.tgz
+package.xml
+/Image_Canvas-0.3.3.tgz
diff --git a/php-pear-Image-Canvas.spec b/php-pear-Image-Canvas.spec
index 6c50332..880d053 100644
--- a/php-pear-Image-Canvas.spec
+++ b/php-pear-Image-Canvas.spec
@@ -1,19 +1,23 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name Image_Canvas
 
+# tests are not unit or regression tests. This is because it is not
+# possible to compare output from Image_Driver with an expected "value"
+
 Name:           php-pear-Image-Canvas
-Version:        0.3.2
-Release:        2%{?dist}
+Version:        0.3.3
+Release:        1%{?dist}
 Summary:        Common interface to image drawing
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://pear.php.net/package/Image_Canvas
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.8.1
+
 Requires:       php-pear(PEAR)
 Requires:       php-pear(Image_Color) >= 1.0.0
 #Requires(hint): php-pecl-pdflib
@@ -32,6 +36,14 @@ image source code independent on the library used.
 cp /etc/php.ini .
 echo "date.timezone=UTC" >>php.ini
 
+# Create a README.Fedora file for PDF usage
+cat > README.Fedora << EOF
+To use PDF.php in this package, you must install the php-pecl-pdflib
+package which is available in other 3rd party repositories.  The
+php-pecl-pdflib package is not required to use this package as long
+as you do not use the PDF features.
+EOF
+
 cd %{pear_name}-%{version}
 # Package.xml is V2
 mv ../package.xml %{name}.xml
@@ -43,14 +55,14 @@ cd %{pear_name}-%{version}
 
 
 %install
-cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
+cd %{pear_name}-%{version}
 PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Move documentation
 mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
-find docdir -type f -exec sed -i 's/\r//' {} \;
+mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/docs ../docdir
+find ../docdir -type f -exec sed -i 's/\r//' {} \;
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -59,14 +71,6 @@ rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
-# Create a README.Fedora file for PDF usage
-cat > README.Fedora << EOF
-To use PDF.php in this package, you must install the php-pecl-pdflib
-package which is available in other 3rd party repositories.  The
-php-pecl-pdflib package is not required to use this package as long
-as you do not use the PDF features.
-EOF
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -85,8 +89,8 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/*
-%doc %{pear_name}-%{version}/README.Fedora
+%doc docdir/*
+%doc README.Fedora
 %{pear_xmldir}/%{name}.xml
 %{pear_testdir}/%{pear_name}
 %{pear_datadir}/%{pear_name}
@@ -94,6 +98,9 @@ fi
 
 
 %changelog
+* Thu Oct 28 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.3.3-1
+- Version 0.3.3 (alpha) - API 0.3.2 (alpha) - QA release
+
 * Wed Aug 18 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.3.2-2
 - rename Image_Canvas.xml to php-pear-Image-Canvas.xml
 - set date.timezone during build
diff --git a/sources b/sources
index a3fa14f..c42b3cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0ffb421ade2f9c8234861cc73550e503  Image_Canvas-0.3.2.tgz
+5998eb6954c4584a71b933df1c9c387a  Image_Canvas-0.3.3.tgz