[moodle] Fix CAS unbundling.
Jon Ciesla
limb at fedoraproject.org
Tue Mar 13 18:05:51 UTC 2012
commit 5c1ed5e170638101d7c93bc4b9f04735a696b5b7
Author: Jon Ciesla <limburgher at gmail.com>
Date: Tue Mar 13 13:05:38 2012 -0500
Fix CAS unbundling.
moodle.spec | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/moodle.spec b/moodle.spec
index 4aa9f44..69c3898 100644
--- a/moodle.spec
+++ b/moodle.spec
@@ -7,7 +7,7 @@
Name: moodle
Version: 2.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A Course Management System
Group: Applications/Publishing
@@ -351,8 +351,8 @@ ln -s /usr/share/fonts/gnu-free/FreeSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lib/
#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
@@ -379,13 +379,13 @@ 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
@@ -400,6 +400,10 @@ 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,-)
%doc README* COPYING.txt TRADEMARK.txt local/readme.txt
@@ -412,6 +416,7 @@ 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*
@@ -436,6 +441,9 @@ fi
%exclude %{moodlewebdir}/COPYING.txt
%changelog
+* Tue Mar 13 2012 Jon Ciesla <limburgher at gmail.com> - 2.2.1-2
+- Fixed CAS unbundling per rcollet.
+
* Tue Jan 24 2012 Jon Ciesla <limburgher at gmail.com> - 2.2.1-1
- New upstream, BZ 783534.
More information about the scm-commits
mailing list