packages: php-pear-Image_Text/php-pear-Image_Text.spec, php-pear-Image_Text...

Tue Nov 16 15:53:56 CET 2010

Author: glen                         Date: Tue Nov 16 14:53:56 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.6.0 beta release

---- Files affected:
packages/php-pear-Image_Text:
   php-pear-Image_Text.spec (1.30 -> 1.31) , fontpath.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php-pear-Image_Text/php-pear-Image_Text.spec
diff -u packages/php-pear-Image_Text/php-pear-Image_Text.spec:1.30 packages/php-pear-Image_Text/php-pear-Image_Text.spec:1.31

--- packages/php-pear-Image_Text/php-pear-Image_Text.spec:1.30	Sat Aug 21 21:09:21 2010
+++ packages/php-pear-Image_Text/php-pear-Image_Text.spec	Tue Nov 16 15:53:51 2010
@@ -1,26 +1,24 @@
 # $Revision$, $Date$
 %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)
 
@@ -29,9 +27,9 @@
 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}.
 
@@ -41,47 +39,33 @@
 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
@@ -89,13 +73,9 @@
 %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}
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -103,6 +83,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2010/11/16 14:53:51  glen
+- up to 0.6.0 beta release
+
 Revision 1.30  2010/08/21 19:09:21  glen
 - updated deps with pearize.sh
 - release 6

================================================================
Index: packages/php-pear-Image_Text/fontpath.patch
diff -u /dev/null packages/php-pear-Image_Text/fontpath.patch:1.1
--- /dev/null	Tue Nov 16 15:53:56 2010
+++ packages/php-pear-Image_Text/fontpath.patch	Tue Nov 16 15:53:51 2010
@@ -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,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pear-Image_Text/php-pear-Image_Text.spec?r1=1.30&r2=1.31&f=u

