SPECS: nagios-fruity.spec - really use system adodb

[glen]

Author: glen                         Date: Sun Mar 12 17:20:44 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- really use system adodb

---- Files affected:
SPECS:
   nagios-fruity.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/nagios-fruity.spec
diff -u SPECS/nagios-fruity.spec:1.13 SPECS/nagios-fruity.spec:1.14
--- SPECS/nagios-fruity.spec:1.13	Thu Mar  2 21:12:58 2006
+++ SPECS/nagios-fruity.spec	Sun Mar 12 18:20:39 2006
@@ -1,6 +1,6 @@
 # $Revision$, $Date$
 %define		_rc rc1
-%define		_rel 0.1
+%define		_rel 0.3
 Summary:	Nagios Configuration Tool
 Summary(pl):	Narzędzie konfiguracyjne dla Nagiosa
 Name:		nagios-fruity
@@ -10,10 +10,11 @@
 Group:		Applications/WWW
 Source0:	http://dl.sourceforge.net/fruity/fruity-%{version}-%{_rc}.tar.gz
 # Source0-md5:	5571da4c337dab1a189b0fcaf795dfc9
+Patch0:		%{name}-adodb.patch
 URL:		http://fruity.sourceforge.net/
 BuildRequires:	rpmbuild(macros) >= 1.264
 BuildRequires:	sed >= 4.0
-Requires:	adodb
+Requires:	adodb >= 4.67-1.17
 Requires:	nagios >= 2.0-0.b4
 Requires:	php >= 4:5.0.0
 Requires:	php-mysql
@@ -38,13 +39,14 @@
 
 %prep
 %setup -q -n fruity-%{version}-%{_rc}
-rm -rf CVS
+mv includes/config.inc{,.dist}
 rm -r config # no longer used
+rm -rf includes/adodb # using system adodb
 
 # undos the source
 find '(' -name '*.php' -o -name '*.inc' ')' -print0 | xargs -0 sed -i -e 's,\r$,,'
 
-mv includes/config.inc{,.dist}
+%patch0 -p1
 
 cat <<EOF > apache.conf
 Alias /fruity %{_appdir}
@@ -114,6 +116,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2006/03/12 17:20:39  glen
+- really use system adodb
+
 Revision 1.13  2006/03/02 20:12:58  glen
 - 1.0-rc1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nagios-fruity.spec?r1=1.13&r2=1.14&f=u