- up to 0.6.0 beta release

Changed files:
    fontpath.patch -> 1.1
    php-pear-Image_Text.spec -> 1.31

diff --git a/fontpath.patch b/fontpath.patch
new file mode 100644 (file)
index 0000000..306f643
--- /dev/null
+++ b/fontpath.patch
@@ -0,0 +1,11 @@
+--- Image_Text-0.6.0/usr/share/pear/Image/Text.php~    2010-11-16 16:49:01.000000000 +0200
++++ Image_Text-0.6.0/usr/share/pear/Image/Text.php     2010-11-16 16:50:25.906078543 +0200
+@@ -230,7 +230,7 @@
+             'enable_alpha'      => false,
+ 
+             // font settings
+-            'font_path'         => "./",
++            'font_path'         => "/usr/share/fonts/TTF/",
+             'font_file'         => null,
+             'font_size'         => 2,
+             'line_spacing'      => 0.5,

diff --git a/php-pear-Image_Text.spec b/php-pear-Image_Text.spec
index bec8ba2785ef99a36ed2ef878b774d9ba269dc93..54e99a51f84a561f71cd3f2e44ed86afd72454e3 100644 (file)
--- a/php-pear-Image_Text.spec
+++ b/php-pear-Image_Text.spec
@@ -1,25 +1,23 @@
 %include       /usr/lib/rpm/macros.php
-%define                _class          Image
-%define                _subclass       Text
 %define                _status         beta
-%define                _pearname       %{_class}_%{_subclass}
-%define                subver  beta
-%define                rel             6
+%define                _pearname       Image_Text
 Summary:       %{_pearname} - comfortable processing of texts in images
 Summary(pl.UTF-8):     %{_pearname} - komfortowe przetwarzanie tekstu w obrazkach
 Name:          php-pear-%{_pearname}
 Version:       0.6.0
-Release:       0.%{subver}.%{rel}
+Release:       1
 License:       PHP 2.02
 Group:         Development/Languages/PHP
-Source0:       http://pear.php.net/get/%{_pearname}-%{version}%{subver}.tgz
-# Source0-md5: 11ef956fc2a93fd359a80bde7fc0e8e8
+Source0:       http://pear.php.net/get/%{_pearname}-%{version}.tgz
+# Source0-md5: c62ba5d96331a6ee9fc6b4babea574b9
+Patch0:                fontpath.patch
 URL:           http://pear.php.net/package/Image_Text/
 BuildRequires: php-pear-PEAR
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
 BuildRequires: rpmbuild(macros) >= 1.300
 Requires:      php-gd
 Requires:      php-pear
+Obsoletes:     php-pear-Image_Text-tests
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -28,9 +26,9 @@ This class allows you to add text to dynamic generated images more
 comfortable. It allows you to process multiline text and manipulate:
 - Border
 - Shading
-- Alignment
-Another nice feature is to let the class measurize your text in respect
-to font size and line splitting to fit a given text box.
+- Alignment Another nice feature is to let the class measurize your
+  text in respect to font size and line splitting to fit a given text
+  box.
 
 In PEAR status of this package is: %{_status}.
 
@@ -40,47 +38,33 @@ obrazków w sposób bardziej komfortowy niż dotychczas. Możliwe jest
 przetwarzanie tekstów wielolinijkowych i manipulowanie:
 - obramowaniem
 - cieniem
-- ustawieniem.
-Inną ciekawą cechą jest pozwolenie klasie na zmierzenie tekstu w
-zależności od rozmiaru czcionki i dzielenie go na linie, aby zmieścił
-się w podanym polu tekstowym.
+- ustawieniem. Inną ciekawą cechą jest pozwolenie klasie na zmierzenie
+  tekstu w zależności od rozmiaru czcionki i dzielenie go na linie, aby
+  zmieścił się w podanym polu tekstowym.
 
 Ta klasa ma w PEAR status: %{_status}.
 
-%package tests
-Summary:       Tests for PEAR::%{_pearname}
-Summary(pl.UTF-8):     Testy dla PEAR::%{_pearname}
-Group:         Development/Languages/PHP
-Requires:      %{name} = %{version}-%{release}
-Requires:      fonts-TTF-bitstream-vera
-AutoProv:      no
-AutoReq:       no
-
-%description tests
-Tests for PEAR::%{_pearname}.
-
-%description tests -l pl.UTF-8
-Testy dla PEAR::%{_pearname}.
-
 %prep
 %pear_package_setup
+%patch0 -p1
+
+mv docs/%{_pearname}/example examples
 
 # tests -> tests/%{_pearname}
 install -d ./%{php_pear_dir}/tests/.tmp
 mv ./%{php_pear_dir}/tests/{*,.tmp}
 mv ./%{php_pear_dir}/tests/{.tmp,%{_pearname}}
 
-# use system Vera.ttf
-sed -i -e "s,'Vera.ttf','/usr/share/fonts/TTF/Vera.ttf'," usr/share/pear/tests/Image_Text/TextTest.php
-sed -i -e "s,'Vera.ttf','/usr/share/fonts/TTF/Vera.ttf'," docs/Image_Text/example/example.php
-sed -i -e 's,"./Vera.ttf","/usr/share/fonts/TTF/Vera.ttf",' docs/Image_Text/example/example.php
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{php_pear_dir},%{_bindir}}
 %pear_package_install
 
-rm -f $RPM_BUILD_ROOT%{php_pear_dir}/data/Image_Text/tests/Vera.ttf
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
+# tests should not be packaged
+%{__rm} -r $RPM_BUILD_ROOT%{php_pear_dir}/tests/%{_pearname}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -88,10 +72,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc install.log
-%doc docs/%{_pearname}/example
 %{php_pear_dir}/.registry/*.reg
-%{php_pear_dir}/%{_class}/*.php
-
-%files tests
-%defattr(644,root,root,755)
-%{php_pear_dir}/tests/%{_pearname}
+%{php_pear_dir}/Image/*.php
+%{_examplesdir}/%{name}-%{version}