SPECS: php-pear-HTTP_WebDAV_Client.spec, php-pear-HTTP_WebDAV_Serv...

[glen]

Author: glen                         Date: Sun Oct 30 22:40:53 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- conflicting HTTP/WebDAV/Tools resolved

---- Files affected:
SPECS:
   php-pear-HTTP_WebDAV_Client.spec (1.9 -> 1.10) , php-pear-HTTP_WebDAV_Server.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/php-pear-HTTP_WebDAV_Client.spec
diff -u SPECS/php-pear-HTTP_WebDAV_Client.spec:1.9 SPECS/php-pear-HTTP_WebDAV_Client.spec:1.10
--- SPECS/php-pear-HTTP_WebDAV_Client.spec:1.9	Wed Oct  5 20:31:31 2005
+++ SPECS/php-pear-HTTP_WebDAV_Client.spec	Sun Oct 30 23:40:48 2005
@@ -9,7 +9,7 @@
 Summary(pl):	%{_pearname} - wrapper dla strumienia WebDAV
 Name:		php-pear-%{_pearname}
 Version:	0.9.7
-Release:	2
+Release:	3
 License:	PHP
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
@@ -17,7 +17,7 @@
 URL:		http://pear.php.net/package/HTTP_WebDAV_Client/
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 Requires:	php-common >= 3:4.3
-Requires:	php-pear
+Requires:	php-pear >= 4:1.0-9.2
 Requires:	php-pear-HTTP_Request >= 1.0
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -51,7 +51,7 @@
 %{php_pear_dir}/.registry/*.reg
 %{php_pear_dir}/%{_class}/%{_subclass}/*.php
 %{php_pear_dir}/%{_class}/%{_subclass}/Client
-%{php_pear_dir}/%{_class}/%{_subclass}/Tools
+%{php_pear_dir}/%{_class}/%{_subclass}/Tools/*
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -59,6 +59,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2005/10/30 22:40:48  glen
+- conflicting HTTP/WebDAV/Tools resolved
+
 Revision 1.9  2005/10/05 18:31:31  glen
 - rel 2
 

================================================================
Index: SPECS/php-pear-HTTP_WebDAV_Server.spec
diff -u SPECS/php-pear-HTTP_WebDAV_Server.spec:1.14 SPECS/php-pear-HTTP_WebDAV_Server.spec:1.15
--- SPECS/php-pear-HTTP_WebDAV_Server.spec:1.14	Thu Oct  6 19:30:00 2005
+++ SPECS/php-pear-HTTP_WebDAV_Server.spec	Sun Oct 30 23:40:48 2005
@@ -10,7 +10,7 @@
 Name:		php-pear-%{_pearname}
 Version:	1.0.0
 %define	_rc rc1
-%define	_rel 1
+%define	_rel 2
 Release:	0.%{_rc}.%{_rel}
 License:	PHP 2.02
 Group:		Development/Languages/PHP
@@ -19,7 +19,7 @@
 URL:		http://pear.php.net/package/HTTP_WebDAV_Server/
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 Requires:	php-common >= 3:4.3
-Requires:	php-pear
+Requires:	php-pear >= 4:1.0-9.2
 Requires:	php-pear-HTTP >= 1.0
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -52,7 +52,10 @@
 %doc install.log
 %doc docs/%{_pearname}/*
 %{php_pear_dir}/.registry/*.reg
-%{php_pear_dir}/%{_class}/%{_subclass}
+%dir %{php_pear_dir}/%{_class}/%{_subclass}
+%{php_pear_dir}/%{_class}/%{_subclass}/*.php
+%{php_pear_dir}/%{_class}/%{_subclass}/Server
+%{php_pear_dir}/%{_class}/%{_subclass}/Tools/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -60,6 +63,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2005/10/30 22:40:48  glen
+- conflicting HTTP/WebDAV/Tools resolved
+
 Revision 1.14  2005/10/06 17:30:00  glen
 - up to 1.0.0 rc1
 
@@ -80,7 +86,7 @@
 - fixed english information about status of the package
 
 Revision 1.8  2004/04/25 17:40:54  adamg
-- updated to 0.99.1; simplified %%files
+- updated to 0.99.1; simplified %files
 
 Revision 1.7  2003/11/22 20:45:51  adamg
 - updated to 0.99
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php-pear-HTTP_WebDAV_Client.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-HTTP_WebDAV_Server.spec?r1=1.14&r2=1.15&f=u