[moodle/f18] Fix QuickForm.

[Jon Ciesla]

commit 21d776349043b121ec5fdcfed7bdddd5d88fa22a
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Fri Jul 12 14:29:46 2013 -0500

    Fix QuickForm.

 moodle-QuickForm.patch |   13 +++++++++++++
 moodle.spec            |   11 +++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/moodle-QuickForm.patch b/moodle-QuickForm.patch
new file mode 100644
index 0000000..3623702
--- /dev/null
+++ b/moodle-QuickForm.patch
@@ -0,0 +1,13 @@
+--- lib/formslib.php~	2013-07-06 10:53:38.000000000 -0500
++++ lib/formslib.php	2013-07-12 12:31:50.928453644 -0500
+@@ -39,8 +39,8 @@
+ 
+ /** setup.php includes our hacked pear libs first */
+ require_once 'HTML/QuickForm.php';
+-require_once 'HTML/QuickForm/DHTMLRulesTableless.php';
+-require_once 'HTML/QuickForm/Renderer/Tableless.php';
++require_once 'DHTMLRulesTableless.php';
++require_once 'Tableless.php';
+ require_once 'HTML/QuickForm/Rule.php';
+ 
+ require_once $CFG->libdir.'/filelib.php';
diff --git a/moodle.spec b/moodle.spec
index 8fb19e3..7511bc1 100644
--- a/moodle.spec
+++ b/moodle.spec
@@ -7,7 +7,7 @@
 
 Name:           moodle
 Version:        2.3.8
-Release:       	1%{?dist}
+Release:       	2%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -21,6 +21,7 @@ Source4:        moodle-cron
 Source5:        moodle.init
 Source6:        moodle-README-rpm
 Patch0:         moodle-CVE-2012-6087.patch
+Patch1:		moodle-QuickForm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -56,6 +57,7 @@ effective online learning communities.
 cp %{SOURCE6} README-rpm
 
 %patch0 -p0
+%patch1 -p0
 
 find . -type f \! -name \*.pl -exec chmod a-x {} \;
 find . -name \*.cgi -exec chmod a+x {} \;
@@ -120,7 +122,9 @@ ln -s /usr/share/pear/Crypt/CHAP.php $RPM_BUILD_ROOT/var/www/moodle/web/lib/pear
 rm -rf $RPM_BUILD_ROOT/var/www/moodle/web/lib/pear/HTML/Common.php
 ln -s /usr/share/pear/HTML/Common.php $RPM_BUILD_ROOT/var/www/moodle/web/lib/pear/HTML/Common.php
 
-#use system php-pear-HTML-QuickForm
+#use system php-pear-HTML-QuickForm, preserving two added files.
+mv $RPM_BUILD_ROOT/var/www/moodle/web/lib/pear/HTML/QuickForm/DHTMLRulesTableless.php $RPM_BUILD_ROOT/var/www/moodle/web/lib/pear/
+mv $RPM_BUILD_ROOT/var/www/moodle/web/lib/pear/HTML/QuickForm/Renderer/Tableless.php $RPM_BUILD_ROOT/var/www/moodle/web/lib/pear/
 rm -rf $RPM_BUILD_ROOT/var/www/moodle/web/lib/pear/HTML/QuickForm*
 ln -s /usr/share/pear/HTML/QuickForm $RPM_BUILD_ROOT/var/www/moodle/web/lib/pear/HTML/QuickForm
 ln -s /usr/share/pear/HTML/QuickForm.php $RPM_BUILD_ROOT/var/www/moodle/web/lib/pear/HTML/QuickForm.php
@@ -222,6 +226,9 @@ fi
 %exclude %{moodlewebdir}/COPYING.txt
 
 %changelog
+* Fri Jul 12 2013 Jon Ciesla <limburgher at gmail.com> - 2.3.8-2
+- Include two non-upstream additions to HTML-Quickform.
+
 * Fri Jul 12 2013 Jon Ciesla <limburgher at gmail.com> - 2.3.8-1
 - 2.3.8.