rpms/moodle/devel moodle.spec,1.26,1.27

[Jon Ciesla (limb)]

Author: limb

Update of /cvs/pkgs/rpms/moodle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30773

Modified Files:
	moodle.spec 
Log Message:
More moves to use of system libs.



Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- moodle.spec	6 Aug 2008 15:59:39 -0000	1.26
+++ moodle.spec	6 Aug 2008 18:21:49 -0000	1.27
@@ -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:       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 @@
 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 @@
   /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 @@
 %{_sbindir}/%{name}-cron
 
 %changelog
+* Wed Aug 06 2008 Jon Ciesla <limb at 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 at jcomserv.net> - 1.9.2-1
 - Updated to 1.9.2.
 - Remove bundled Smarty, use system php-Smarty. BZ 457886.