From 5260d7e95b8581e49db6864ab0b0e0b71c4df17c Mon Sep 17 00:00:00 2001
From: Jon Ciesla <limb@fedoraproject.org>
Date: Aug 06 2008 18:21:49 +0000
Subject: More moves to use of system libs.


---

diff --git a/moodle.spec b/moodle.spec
index ac70b38..7a7487f 100644
--- a/moodle.spec
+++ b/moodle.spec
@@ -7,7 +7,7 @@
 
 Name:           moodle
 Version:        1.9.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -105,6 +105,8 @@ Requires:       php-gd vixie-cron mimetex perl(lib) php-mysql php-xmlrpc
 Requires:       perl(Encode) perl(Text::Aspell) perl(HTML::Parser) php
 Requires:       perl(HTML::Entities) perl(CGI)
 Requires:	php-Smarty
+Requires:	php-adodb
+Requires:	php-magpierss
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -1470,6 +1472,14 @@ find $RPM_BUILD_ROOT -name \*.mimetex-\* -exec rm {} \;
 rm -rf $RPM_BUILD_ROOT/var/www/moodle/web/lib/smarty
 ln -s /usr/share/php/Smarty/ $RPM_BUILD_ROOT/var/www/moodle/web/lib/smarty
 
+#use system adodb
+rm -rf $RPM_BUILD_ROOT/var/www/moodle/web/lib/adodb
+ln -s /usr/share/php/adodb/ $RPM_BUILD_ROOT/var/www/moodle/web/lib/adodb
+
+#use system magpierss
+rm -rf $RPM_BUILD_ROOT/var/www/moodle/web/lib/magpie
+ln -s /usr/share/php/magpierss/ $RPM_BUILD_ROOT/var/www/moodle/web/lib/magpie
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1482,6 +1492,11 @@ if [ $1 = 0 ]; then
   /sbin/chkconfig --del %{name}
 fi
 
+%pre
+rm -rf /var/www/moodle/web/lib/smarty
+rm -rf /var/www/moodle/web/lib/adodb
+rm -rf /var/www/moodle/web/lib/magpie
+
 %files
 %defattr(-,root,root,-)
 %doc README*
@@ -1617,6 +1632,10 @@ fi
 %{_sbindir}/%{name}-cron
 
 %changelog
+* Wed Aug 06 2008 Jon Ciesla <limb@jcomserv.net> - 1.9.2-2
+- Remove bundled adodb, use system php-adodb. BZ 457886.
+- Remove bundled magpie, use system php-magpierss. BZ 457886.
+
 * Wed Aug 06 2008 Jon Ciesla <limb@jcomserv.net> - 1.9.2-1
 - Updated to 1.9.2.
 - Remove bundled Smarty, use system php-Smarty. BZ 457886.