[moodle/el5/master] Stop bundling CAS.

Jon Ciesla limb at fedoraproject.org
Fri Aug 20 15:35:48 UTC 2010


commit 7a416d3dd709c08d2d90b5902aca9696b6498e77
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Fri Aug 20 10:34:25 2010 -0500

    Stop bundling CAS.

 moodle.spec |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/moodle.spec b/moodle.spec
index 61b555b..a6dd2fe 100644
--- a/moodle.spec
+++ b/moodle.spec
@@ -8,7 +8,7 @@
 
 Name:           moodle
 Version:        1.8.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -110,6 +110,7 @@ BuildRequires:  unzip
 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) freefont
+Requires:	php-pear-CAS
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -1575,12 +1576,27 @@ ln -s /usr/share/fonts/freefont/FreeSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lib/
 rm -f $RPM_BUILD_ROOT%{moodlewebdir}/lang/km_utf8/fonts/default.ttf
 ln -s /usr/share/fonts/khmeros/KhmerOS_sys.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lang/km_utf8/fonts/default.ttf
 
+#use system php-pear-CAS
+rm -rf $RPM_BUILD_ROOT/var/www/moodle/web/auth/cas
+ln -s /usr/share/pear/ $RPM_BUILD_ROOT/var/www/moodle/web/auth/cas
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add %{name}
 
+if [ -d /var/www/moodle/web/auth/cas -a ! -L /var/www/moodle/web/auth/cas ]; then
+  mv /var/www/moodle/web/auth.cas /var/www/moodle/web/auth/cas.rpmbak && \
+  ln -s /usr/share/pear/ /var/www/moodle/web/auth/cas
+  rm -rf /var/www/moodle/web/auth/cas.rpmbak
+fi
+if [ ! -L /var/www/moodle/web/auth/cas ]; then
+  ln -s /usr/share/pear/ /var/www/moodle/web/auth/cas
+fi
+
+
 %preun
 if [ $1 = 0 ]; then
   /sbin/service %{name} stop >/dev/null 2>&1
@@ -1721,6 +1737,9 @@ fi
 %exclude %{moodlewebdir}/COPYING.txt
 
 %changelog
+* Fri Aug 20 2010 Jon Ciesla <limb at jcomserv.net> - 1.8.13-2
+- Switch to system php-pear-CAS, BZ 577467, 620772.
+
 * Tue Jun 22 2010 Jon Ciesla <limb at jcomserv.net> - 1.8.13-1
 - 1.8.13, BZ 605810.
 


More information about the scm-commits mailing list