up to 0.7.0

diff --git a/fontpath.patch b/fontpath.patch
index 306f6435ed575f7c546c77369a17cc3d0a1bc412..dfc2108a6454b29ce003deb0bcec6a3491e104e9 100644 (file)
--- a/fontpath.patch
+++ b/fontpath.patch
@@ -1,11 +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,
+--- Image_Text-0.7.0/usr/share/pear/Image/Text.php~    2014-08-08 23:11:23.000000000 +0300
++++ Image_Text-0.7.0/usr/share/pear/Image/Text.php     2014-08-08 23:12:12.606734506 +0300
+@@ -178,7 +178,7 @@
+         'enable_alpha' => false,
  
-             // font settings
--            'font_path'         => "./",
-+            'font_path'         => "/usr/share/fonts/TTF/",
-             'font_file'         => null,
-             'font_size'         => 2,
-             'line_spacing'      => 0.5,
+         // 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 d366823e809e7572e66da1ba01759a570f2121de..11e75fd9f787eb919c42214a0e023ac4b4e94eeb 100644 (file)
--- a/php-pear-Image_Text.spec
+++ b/php-pear-Image_Text.spec
@@ -1,20 +1,22 @@
 %define                status          beta
 %define                pearname        Image_Text
+%define                php_min_version 5.0.0
 %include       /usr/lib/rpm/macros.php
 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.1
-Release:       2
+Version:       0.7.0
+Release:       1
 License:       PHP 2.02
 Group:         Development/Languages/PHP
 Source0:       http://pear.php.net/get/%{pearname}-%{version}.tgz
-# Source0-md5: 5b07f8fe4d384e89cdb273f3a05b1216
+# Source0-md5: 034c356787c73dd1a88567bf01bb7923
 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.580
+Requires:      php(core) >= %{php_min_version}
 Requires:      php(gd)
 Requires:      php-pear
 Obsoletes:     php-pear-Image_Text-tests
@@ -48,14 +50,8 @@ Ta klasa ma w PEAR status: %{status}.
 %pear_package_setup
 %patch0 -p1
 
-mv .%{php_pear_dir}/data/Image_Text/README .
-
-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}}
+mv docs/%{pearname}/* .
+mv .%{php_pear_dir}/tests/Image_Text/tests .
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -73,5 +69,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc README
 %doc install.log
 %{php_pear_dir}/.registry/*.reg
-%{php_pear_dir}/Image/*.php
+%{php_pear_dir}/Image/Text.php
+%{php_pear_dir}/Image/Text
 %{_examplesdir}/%{name}-%{version}