SPECS: horde.spec - make XML/sql2xml.php dependency optional as th...

glen glen at pld-linux.org
Sat Oct 8 20:29:12 CEST 2005


Author: glen                         Date: Sat Oct  8 18:29:12 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- make XML/sql2xml.php dependency optional as that package is not compatible with php 5
- see also http://bugs.horde.org/ticket/?id=2748

---- Files affected:
SPECS:
   horde.spec (1.107 -> 1.108) 

---- Diffs:

================================================================
Index: SPECS/horde.spec
diff -u SPECS/horde.spec:1.107 SPECS/horde.spec:1.108
--- SPECS/horde.spec:1.107	Wed Sep 21 21:20:51 2005
+++ SPECS/horde.spec	Sat Oct  8 20:29:06 2005
@@ -2,7 +2,7 @@
 %define	_hordeapp horde
 #define	_snap	2005-08-01
 #define	_rc		rc1
-%define	_rel	2
+%define	_rel	2.2
 
 # TODO:
 # - support for Oracle and Sybase
@@ -33,6 +33,7 @@
 Patch2:		%{name}-util-h3.patch
 Patch3:		%{name}-blank-admins.patch
 Patch4:		%{name}-config-xml.patch
+Patch5:		%{name}-sql2xml.patch
 URL:		http://www.horde.org/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
@@ -62,7 +63,7 @@
 
 # horde accesses it directly in help->about
 %define		_noautocompressdoc  CREDITS
-%define		_noautoreq	'pear(XML/WBXML.*)' 'pear(Horde.*)' 'pear(Text/.*)' 'pear(Net/IMSP.*)'
+%define		_noautoreq	'pear(XML/WBXML.*)' 'pear(Horde.*)' 'pear(Text/.*)' 'pear(Net/IMSP.*)' 'pear(XML/sql2xml.php)'
 
 %define		hordedir	/usr/share/horde
 %define		_sysconfdir	/etc/horde.org
@@ -120,6 +121,7 @@
 %patch2 -p1
 %patch3 -p0
 %patch4 -p1
+%patch5 -p1
 
 sed -i -e "
 s#dirname(__FILE__) . '/..#'%{hordedir}#g
@@ -332,6 +334,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.108  2005/10/08 18:29:06  glen
+- make XML/sql2xml.php dependency optional as that package is not compatible with php 5
+- see also http://bugs.horde.org/ticket/?id=2748
+
 Revision 1.107  2005/09/21 19:20:51  qboosh
 - pl desc fix
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.107&r2=1.108&f=u




More information about the pld-cvs-commit mailing list