Author: glen Date: Wed Sep 28 21:25:08 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- conflicts line bugfix
---- Files affected:
SPECS:
php-pear-PEAR.spec (1.71 -> 1.72)
---- Diffs:
================================================================
Index: SPECS/php-pear-PEAR.spec
diff -u SPECS/php-pear-PEAR.spec:1.71 SPECS/php-pear-PEAR.spec:1.72
--- SPECS/php-pear-PEAR.spec:1.71 Mon Sep 26 22:10:55 2005
+++ SPECS/php-pear-PEAR.spec Wed Sep 28 23:25:03 2005
@@ -9,7 +9,7 @@
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
@@ -20,6 +20,7 @@
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
@@ -68,6 +69,8 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+cd ./%{php_pear_dir}
+%patch4 -p1
find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v
@@ -113,6 +116,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.72 2005/09/28 21:25:03 glen
+- conflicts line bugfix
+
Revision 1.71 2005/09/26 20:10:55 glen
- 1.4.1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php-pear-PEAR.spec?r1=1.71&r2=1.72&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
