- updated to 0.1.2

Changed files:
    php-pear-PHP_Beautifier-path_fix.patch -> 1.2
    php-pear-PHP_Beautifier.spec -> 1.11

diff --git a/php-pear-PHP_Beautifier-path_fix.patch b/php-pear-PHP_Beautifier-path_fix.patch
index e5d0b8b95e1fdb88586bbd52b419427a6f3c210f..ca0102004d334f222880767048fbcfa6e787c578 100644 (file)
--- a/php-pear-PHP_Beautifier-path_fix.patch
+++ b/php-pear-PHP_Beautifier-path_fix.patch
@@ -1,7 +1,7 @@
-diff -burN php-pear-PHP_Beautifier-0.0.9.orig/PHP_Beautifier-0.0.9/Beautifier/Batch/Output/DirectoryBz2.php php-pear-PHP_Beautifier-0.0.9/PHP_Beautifier-0.0.9/Beautifier/Batch/Output/DirectoryBz2.php
---- php-pear-PHP_Beautifier-0.0.9.orig/PHP_Beautifier-0.0.9/Beautifier/Batch/Output/DirectoryBz2.php   2004-12-05 12:13:30.436060952 +0100
-+++ php-pear-PHP_Beautifier-0.0.9/PHP_Beautifier-0.0.9/Beautifier/Batch/Output/DirectoryBz2.php        2004-12-05 12:22:11.407861200 +0100
-@@ -26,7 +26,7 @@
+diff -burN a.orig/b/Beautifier/Batch/Output/DirectoryBz2.php a/b/Beautifier/Batch/Output/DirectoryBz2.php
+--- a.orig/b/Beautifier/Batch/Output/DirectoryBz2.php  2005-02-07 09:17:43.047075360 +0100
++++ a/b/Beautifier/Batch/Output/DirectoryBz2.php       2005-02-07 09:18:31.882651224 +0100
+@@ -23,7 +23,7 @@
      /**\r
      * Include PHP_Beautifier_Batch_DirectoryTar\r
      */    \r
@@ -9,11 +9,11 @@ diff -burN php-pear-PHP_Beautifier-0.0.9.orig/PHP_Beautifier-0.0.9/Beautifier/Ba
 +    require_once ('PHP/Beautifier/Batch/Output/DirectoryTar.php');\r
      /**\r
      * PHP_Beautifier_Batch_FilesGz\r
-     * Handle the batch process for multiple php files to one directory.\r
-diff -burN php-pear-PHP_Beautifier-0.0.9.orig/PHP_Beautifier-0.0.9/Beautifier/Batch/Output/DirectoryGz.php php-pear-PHP_Beautifier-0.0.9/PHP_Beautifier-0.0.9/Beautifier/Batch/Output/DirectoryGz.php
---- php-pear-PHP_Beautifier-0.0.9.orig/PHP_Beautifier-0.0.9/Beautifier/Batch/Output/DirectoryGz.php    2004-12-05 12:13:30.437060800 +0100
-+++ php-pear-PHP_Beautifier-0.0.9/PHP_Beautifier-0.0.9/Beautifier/Batch/Output/DirectoryGz.php 2004-12-05 12:22:27.911352288 +0100
-@@ -26,7 +26,7 @@
+     *\r
+diff -burN a.orig/b/Beautifier/Batch/Output/DirectoryGz.php a/b/Beautifier/Batch/Output/DirectoryGz.php
+--- a.orig/b/Beautifier/Batch/Output/DirectoryGz.php   2005-02-07 09:17:43.047075360 +0100
++++ a/b/Beautifier/Batch/Output/DirectoryGz.php        2005-02-07 09:19:00.361321808 +0100
+@@ -23,7 +23,7 @@
      /**\r
      * Include PHP_Beautifier_Batch_DirectoryTar\r
      */    \r
@@ -21,49 +21,52 @@ diff -burN php-pear-PHP_Beautifier-0.0.9.orig/PHP_Beautifier-0.0.9/Beautifier/Ba
 +    require_once ('PHP/Beautifier/Batch/Output/DirectoryTar.php');\r
      /**\r
      * PHP_Beautifier_Batch_FilesGz\r
-     * Handle the batch process for multiple php files to one directory.\r
-diff -burN php-pear-PHP_Beautifier-0.0.9.orig/PHP_Beautifier-0.0.9/Beautifier/Batch/Output/FilesBz2.php php-pear-PHP_Beautifier-0.0.9/PHP_Beautifier-0.0.9/Beautifier/Batch/Output/FilesBz2.php
---- php-pear-PHP_Beautifier-0.0.9.orig/PHP_Beautifier-0.0.9/Beautifier/Batch/Output/FilesBz2.php       2004-12-05 12:13:30.438060648 +0100
-+++ php-pear-PHP_Beautifier-0.0.9/PHP_Beautifier-0.0.9/Beautifier/Batch/Output/FilesBz2.php    2004-12-05 12:23:15.008192480 +0100
-@@ -26,7 +26,7 @@
+     *\r
+diff -burN a.orig/b/Beautifier/Batch/Output/FilesBz2.php a/b/Beautifier/Batch/Output/FilesBz2.php
+--- a.orig/b/Beautifier/Batch/Output/FilesBz2.php      2005-02-07 09:17:43.048075208 +0100
++++ a/b/Beautifier/Batch/Output/FilesBz2.php   2005-02-07 09:19:31.575576520 +0100
+@@ -23,7 +23,7 @@
      /**\r
      * Include PHP_Beautifier_Batch_FilesGz\r
      */    \r
 -    require_once 'FilesTar.php';\r
 +    require_once 'PHP/Beautifier/Batch/Output/FilesTar.php';\r
      /**\r
-     * PHP_Beautifier_Batch_FilesBz2\r
      * Handle the batch process for one/multiple php files to one tar bzip2 file\r
-diff -burN php-pear-PHP_Beautifier-0.0.9.orig/PHP_Beautifier-0.0.9/Beautifier/Batch/Output/FilesGz.php php-pear-PHP_Beautifier-0.0.9/PHP_Beautifier-0.0.9/Beautifier/Batch/Output/FilesGz.php
---- php-pear-PHP_Beautifier-0.0.9.orig/PHP_Beautifier-0.0.9/Beautifier/Batch/Output/FilesGz.php        2004-12-05 12:13:30.438060648 +0100
-+++ php-pear-PHP_Beautifier-0.0.9/PHP_Beautifier-0.0.9/Beautifier/Batch/Output/FilesGz.php     2004-12-05 12:23:45.060623816 +0100
-@@ -26,7 +26,7 @@
+     *\r
+diff -burN a.orig/b/Beautifier/Batch/Output/FilesGz.php a/b/Beautifier/Batch/Output/FilesGz.php
+--- a.orig/b/Beautifier/Batch/Output/FilesGz.php       2005-02-07 09:17:43.048075208 +0100
++++ a/b/Beautifier/Batch/Output/FilesGz.php    2005-02-07 09:19:46.708276000 +0100
+@@ -23,7 +23,7 @@
      /**\r
-     * Require FilesTar\r
-     */\r
--    include_once 'FilesTar.php';    \r
-+    include_once 'PHP/Beautifier/Batch/Output/FilesTar.php';    \r
+     * Include PHP_Beautifier_Batch_FilesGz\r
+     */    \r
+-    require_once 'FilesTar.php';\r
++    require_once 'PHP/Beautifier/Batch/Output/FilesTar.php';\r
      /**\r
-     * PHP_Beautifier_Batch_FilesGz\r
-     * Handle the batch process for one/multiple php files to one tar gzipped file\r
-diff -burN php-pear-PHP_Beautifier-0.0.9.orig/PHP_Beautifier-0.0.9/Beautifier/Batch.php php-pear-PHP_Beautifier-0.0.9/PHP_Beautifier-0.0.9/Beautifier/Batch.php
---- php-pear-PHP_Beautifier-0.0.9.orig/PHP_Beautifier-0.0.9/Beautifier/Batch.php       2004-12-05 12:13:30.447059280 +0100
-+++ php-pear-PHP_Beautifier-0.0.9/PHP_Beautifier-0.0.9/Beautifier/Batch.php    2004-12-05 12:19:20.555834656 +0100
-@@ -28,8 +28,8 @@
+     * Handle the batch process for one/multiple php files to one tar gzip file\r
+     *\r
+diff -burN a.orig/b/Beautifier/Batch.php a/b/Beautifier/Batch.php
+--- a.orig/b/Beautifier/Batch.php      2005-02-07 09:17:43.051074752 +0100
++++ a/b/Beautifier/Batch.php   2005-02-07 09:20:45.298368952 +0100
+@@ -23,11 +23,11 @@
      /**
      * Require PHP_Beautifier_Decorator
      */
 -    require_once ('Decorator.php');
--    require_once ('Batch/Output.php');
 +    require_once ('PHP/Beautifier/Decorator.php');
+     /**
+     * Require PHP_Beautifier_Batch_Output
+     */
+-    require_once ('Batch/Output.php');
 +    require_once ('PHP/Beautifier/Batch/Output.php');
      // ArrayNested->off();
      // ArrayNested->on();
      
-diff -burN php-pear-PHP_Beautifier-0.0.9.orig/PHP_Beautifier-0.0.9/Beautifier/StreamWrapper.php php-pear-PHP_Beautifier-0.0.9/PHP_Beautifier-0.0.9/Beautifier/StreamWrapper.php
---- php-pear-PHP_Beautifier-0.0.9.orig/PHP_Beautifier-0.0.9/Beautifier/StreamWrapper.php       2004-12-05 12:13:30.455058064 +0100
-+++ php-pear-PHP_Beautifier-0.0.9/PHP_Beautifier-0.0.9/Beautifier/StreamWrapper.php    2004-12-05 12:19:20.557834352 +0100
-@@ -42,5 +42,5 @@
+diff -burN a.orig/b/Beautifier/StreamWrapper.php a/b/Beautifier/StreamWrapper.php
+--- a.orig/b/Beautifier/StreamWrapper.php      2005-02-07 09:17:43.053074448 +0100
++++ a/b/Beautifier/StreamWrapper.php   2005-02-07 09:21:05.335322872 +0100
+@@ -51,5 +51,5 @@
          function dir_rewinddir();\r
          function dir_closedir();\r
      }\r
@@ -71,10 +74,10 @@ diff -burN php-pear-PHP_Beautifier-0.0.9.orig/PHP_Beautifier-0.0.9/Beautifier/St
 +    require_once('PHP/Beautifier/StreamWrapper/Tarz.php');\r
  ?>
 \ Brak znaku nowej linii na koñcu pliku
-diff -burN php-pear-PHP_Beautifier-0.0.9.orig/PHP_Beautifier-0.0.9/Beautifier.php php-pear-PHP_Beautifier-0.0.9/PHP_Beautifier-0.0.9/Beautifier.php
---- php-pear-PHP_Beautifier-0.0.9.orig/PHP_Beautifier-0.0.9/Beautifier.php     2004-12-05 12:13:30.397066880 +0100
-+++ php-pear-PHP_Beautifier-0.0.9/PHP_Beautifier-0.0.9/Beautifier.php  2004-12-05 12:19:20.560833896 +0100
-@@ -30,15 +30,15 @@
+diff -burN a.orig/b/Beautifier.php a/b/Beautifier.php
+--- a.orig/b/Beautifier.php    2005-02-07 09:17:43.023079008 +0100
++++ a/b/Beautifier.php 2005-02-07 09:21:35.220779592 +0100
+@@ -28,15 +28,15 @@
      /**
      * Require PHP_Beautifier_Filter
      */
@@ -93,7 +96,7 @@ diff -burN php-pear-PHP_Beautifier-0.0.9.orig/PHP_Beautifier-0.0.9/Beautifier.ph
      /**
      * Require Log
      */
-@@ -46,11 +46,11 @@
+@@ -44,11 +44,11 @@
      /**
      * Require Exceptions
      */

diff --git a/php-pear-PHP_Beautifier.spec b/php-pear-PHP_Beautifier.spec
index 2dd585e3d26bb1ea23c20ee1e49c4e9f67ede5f5..8ec7cfcfe8a0a876d89b7cd657a584613c374968 100644 (file)
--- a/php-pear-PHP_Beautifier.spec
+++ b/php-pear-PHP_Beautifier.spec
@@ -7,12 +7,12 @@
 Summary:       %{_pearname} - beautifier for PHP
 Summary(pl):   %{_pearname} - upiêkszacz dla PHP
 Name:          php-pear-%{_pearname}
-Version:       0.0.9
-Release:       3
+Version:       0.1.2
+Release:       1
 License:       PHP 2.02
 Group:         Development/Languages/PHP
 Source0:       http://pear.php.net/get/%{_pearname}-%{version}.tgz
-# Source0-md5: 3644efca0bd50d2cfe711d347d0a7f73
+# Source0-md5: 5a1651dfef74eb3b74e6d2dc5aa064d1
 Patch0:                %{name}-path_fix.patch
 URL:           http://pear.php.net/package/PHP_Beautifier/
 BuildRequires: rpm-php-pearprov >= 4.0.2-98
@@ -34,7 +34,8 @@ Ta klasa ma w PEAR status: %{_status}.
 
 %prep
 %setup -q -c
-%patch0 -p1
+cd %{_pearname}-%{version}
+%patch0 -p2
 
 %build
 cd %{_pearname}-%{version}/scripts