- conflicts line bugfix

Changed files:
    php-pear-PEAR.spec -> 1.72

diff --git a/php-pear-PEAR.spec b/php-pear-PEAR.spec
index fbccc7c7532dc21926af20fb9353dda9aed49975..79d4f65d596808f5eec90e9d0da2e50a6bdf6e45 100644 (file)
--- a/php-pear-PEAR.spec
+++ b/php-pear-PEAR.spec
@@ -8,7 +8,7 @@ Summary:        %{_pearname} - main PHP PEAR class
 Summary(pl):   %{_pearname} - podstawowa klasa dla PHP PEAR
 Name:          php-pear-%{_pearname}
 Version:       1.4.1
-Release:       1
+Release:       1.1
 Epoch:         1
 License:       PHP 3.0
 Group:         Development/Languages/PHP
@@ -19,6 +19,7 @@ Patch0:               %{name}-memory.patch
 Patch1:                %{name}-sysconfdir.patch
 Patch2:                %{name}-rpmpkgname.patch
 Patch3:                %{name}-rpmvars.patch
+Patch4:                http://glen.alkohol.ee/pld/PEAR-makerpm1.patch
 URL:           http://pear.php.net/package/PEAR
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
 BuildRequires: php-pear >= 4:1.0-6
@@ -67,6 +68,8 @@ Ta klasa ma w PEAR status: %{_status}.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+cd ./%{php_pear_dir}
+%patch4 -p1
 
 find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v