[moodle/el5] Fix CAS unbundling.

Jon Ciesla limb at fedoraproject.org
Mon May 14 15:13:22 UTC 2012


commit fb14b1cd890616165c09b5b1c5c4373b46c24553
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon May 14 10:13:08 2012 -0500

    Fix CAS unbundling.

 moodle.spec |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/moodle.spec b/moodle.spec
index da8cc6e..b62877c 100644
--- a/moodle.spec
+++ b/moodle.spec
@@ -8,7 +8,7 @@
 
 Name:           moodle
 Version:        1.8.13
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -1577,8 +1577,8 @@ 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
+rm -rf $RPM_BUILD_ROOT/var/www/moodle/web/auth/cas/CAS
+ln -s /usr/share/pear/ $RPM_BUILD_ROOT/var/www/moodle/web/auth/cas/CAS
 
 
 %clean
@@ -1587,13 +1587,14 @@ 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
+if [ -d /var/www/moodle/web/auth/cas/CAS -a ! -L /var/www/moodle/web/auth/cas/CAS ]; then
+  mv /var/www/moodle/web/auth/cas/CAS /var/www/moodle/web/auth/cas/CAS.rpmbak && \
+  ln -s /usr/share/pear/ /var/www/moodle/web/auth/cas/CAS
+  rm -rf /var/www/moodle/web/auth/cas/CAS.rpmbak
 fi
-if [ ! -L /var/www/moodle/web/auth/cas ]; then
-  ln -s /usr/share/pear/ /var/www/moodle/web/auth/cas
+if [ ! -L /var/www/moodle/web/auth/cas/CAS ]; then
+  ln -s /usr/share/pear/ /var/www/moodle/web/auth/cas/CAS
+
 fi
 
 
@@ -1737,6 +1738,9 @@ fi
 %exclude %{moodlewebdir}/COPYING.txt
 
 %changelog
+* May May 14 2012 Jon Ciesla <limburgher at gmail.com> - 1.8.13-4
+- Fixed CAS unbundling per rcollet.
+
 * Tue Oct 12 2010 Jon Ciesla <limb at jcomserv.net> - 1.8.13-3
 - Fix CAS typo.
 


More information about the scm-commits mailing list