[moodle/el6] Fix CAS unbundling.
Jon Ciesla
limb at fedoraproject.org
Mon May 14 14:36:37 UTC 2012
commit b40429b2095697640f778623a2928fef26bafe21
Author: Jon Ciesla <limburgher at gmail.com>
Date: Mon May 14 09:36:24 2012 -0500
Fix CAS unbundling.
moodle.spec | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
---
diff --git a/moodle.spec b/moodle.spec
index 878f7d0..9765735 100644
--- a/moodle.spec
+++ b/moodle.spec
@@ -7,7 +7,7 @@
Name: moodle
Version: 2.1.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A Course Management System
Group: Applications/Publishing
@@ -93,8 +93,9 @@ rm -f $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
ln -s /usr/share/fonts/gnu-free/FreeSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lib/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
@@ -121,13 +122,14 @@ if [ ! -L /var/www/moodle/web/lib/adodb ]; then
ln -s /usr/share/php/adodb/ /var/www/moodle/web/lib/adodb
fi
-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
@@ -141,6 +143,10 @@ fi
if [ -h /var/www/moodle/web/lib/magpie ]; then
rm -f /var/www/moodle/web/lib/magpie
fi
+if [ -L /var/www/moodle/web/auth/cas ]; then
+ rm -f /var/www/moodle/web/auth/cas
+fi
+
%files
%defattr(-,root,root,-)
@@ -154,6 +160,8 @@ fi
%config(noreplace) %{moodlewebdir}/theme/formal_white/config.php
%config(noreplace) %{moodlewebdir}/theme/standard/config.php
%{moodlewebdir}
+%exclude /var/www/moodle/web/auth/cas/*
+
%exclude %{moodlewebdir}/lib/phpmailer/language/phpmailer.lang-b*
%exclude %{moodlewebdir}/lib/phpmailer/language/phpmailer.lang-c*
@@ -178,6 +186,9 @@ fi
%exclude %{moodlewebdir}/COPYING.txt
%changelog
+* Thu May 10 2012 Jon Ciesla <limburgher at gmail.com> - 2.1.5-3
+- Fixed CAS unbundling per rcollet.
+
* Wed May 09 2012 Jon Ciesla <limburgher at gmail.com> - 2.1.5-2
- Dropped bundled language packs, BZ 748958.
More information about the scm-commits
mailing list