rpms/moodle/F-11 moodle.spec,1.43,1.44 sources,1.20,1.21

Jon Ciesla limb at fedoraproject.org
Tue Dec 8 17:05:22 UTC 2009 

Author: limb

Update of /cvs/pkgs/rpms/moodle/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11280

Modified Files:
	moodle.spec sources 
Log Message:
Update to 1.9.7, BZ 544766.



Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-11/moodle.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- moodle.spec	6 Apr 2009 16:53:52 -0000	1.43
+++ moodle.spec	8 Dec 2009 17:05:22 -0000	1.44
@@ -7,15 +7,15 @@
 %define __perl_provides %{nil}
 
 Name:           moodle
-Version:        1.9.4
-Release:        7%{?dist}
+Version:        1.9.7
+Release:       	1%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://moodle.org/
 Source0:        http://download.moodle.org/stable19/%{name}-%{version}.tgz
-#Using weekly snapshot downloaded 11/7/08 to fix snoopy CVE-2008-4796
+#Using weekly snapshot downloaded 09/23/2009 for new PHP, BZ 525120
 #Source0:        http://download.moodle.org/stable19/moodle-weekly-19.tgz
 Source1:        moodle.conf
 Source2:        moodle-config.php
@@ -102,11 +102,12 @@ Source80:       http://download.moodle.o
 Source81:       http://download.moodle.org/lang16/ta_lk_utf8.zip
 Source82:       http://download.moodle.org/lang16/cy_utf8.zip
 Source83:       http://download.moodle.org/lang16/uz_utf8.zip
+Source84:	http://download.moodle.org/lang16/ur_utf8.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Patch0:		moodle-1.9.3-rce-texed.patch
 Patch1:		moodle-1.9.4-CVE-2009-1171-1.patch
-Patch2:		moodle-1.9.4-CVE-2009-1171-2.patch
+#Patch2:		moodle-1.9.4-CVE-2009-1171-2.patch
 
 BuildRequires:  unzip
 Requires:       php-gd vixie-cron mimetex perl(lib) php-mysql php-xmlrpc
@@ -397,6 +398,18 @@ This package contains the files needed t
 %{moodlewebdir}/lang/de_du_utf8
 %{moodlewebdir}/install/lang/de_du_utf8
 
+%package        dv
+Summary:        Moodle language pack for Dhivehi
+Group:          Applications/Publishing
+Requires:       moodle = %{version}-%{release}
+
+%description    dv
+This package contains the files needed to display Moodle in Dhivehi.
+
+%files          dv
+%defattr (-,root,root,-)
+%{moodlewebdir}/install/lang/dv_utf8
+
 %package        el
 Summary:        Moodle language pack for Greek
 Group:          Applications/Publishing
@@ -1316,6 +1329,18 @@ This package contains the files needed t
 %{moodlewebdir}/install/lang/uk_utf8
 #%{moodlewebdir}/lib/adodb/lang/adodb-uk1251.inc.php
 
+%package        ur
+Summary:        Moodle language pack for Urdu
+Group:          Applications/Publishing
+Requires:       moodle = %{version}-%{release}
+
+%description    ur
+This package contains the files needed to display Moodle in Urdu.
+
+%files          ur
+%defattr (-,root,root,-)
+%{moodlewebdir}/install/lang/ur_utf8
+
 %package        uz
 Summary:        Moodle language pack for Uzbek
 Group:          Applications/Publishing
@@ -1482,7 +1507,7 @@ sed -i 's/\r//' mod/wiki/ewiki/README.de
 
 %patch0 -p0
 %patch1 -p0
-%patch2 -p0
+#%patch2 -p0
 
 %build
 rm config-dist.php install.php tags filter/tex/mimetex.* filter/tex/README.mimetex
@@ -1542,26 +1567,38 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/chkconfig --add %{name}
 
+if [ -d /var/www/moodle/web/lib/smarty -a ! -L /var/www/moodle/web/lib/smarty ]; then
+  mv /var/www/moodle/web/lib/smarty /var/www/moodle/web/lib/smarty.rpmbak && \
+  ln -s /usr/share/php/Smarty/ /var/www/moodle/web/lib/smarty
+  rm -rf /var/www/moodle/web/lib/smarty.rpmbak
+fi
+if [ ! -L /var/www/moodle/web/lib/smarty ]; then
+  ln -s /usr/share/php/Smarty/ /var/www/moodle/web/lib/smarty
+fi
+
+if [ -d /var/www/moodle/web/lib/adodb -a ! -L /var/www/moodle/web/lib/adodb ]; then
+  mv /var/www/moodle/web/lib/adodb /var/www/moodle/web/lib/adodb.rpmbak && \
+  ln -s /usr/share/php/adodb/ /var/www/moodle/web/lib/adodb
+  rm -rf /var/www/moodle/web/lib/adodb.rpmbak
+fi
+if [ ! -L /var/www/moodle/web/lib/adodb ]; then
+  ln -s /usr/share/php/adodb/ /var/www/moodle/web/lib/adodb
+fi
+
 %preun
 if [ $1 = 0 ]; then
   /sbin/service %{name} stop >/dev/null 2>&1
   /sbin/chkconfig --del %{name}
 fi
 
-%pretrans
-if [ -d /var/www/moodle/web/lib/smarty ]; then
-  rm -rf /var/www/moodle/web/lib/smarty
-fi
-if [ -d /var/www/moodle/web/lib/adodb ]; then
-  rm -rf /var/www/moodle/web/lib/adodb
-fi
+%pre
 if [ -h /var/www/moodle/web/lib/magpie ]; then
   rm -f /var/www/moodle/web/lib/magpie
 fi
 
 %files
 %defattr(-,root,root,-)
-%doc README*
+%doc README* COPYING.txt
 %dir %{_var}/www/moodle
 %dir %{moodlewebdir}
 %config(noreplace) %{moodlewebdir}/config.php
@@ -1692,8 +1729,32 @@ fi
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/moodle.conf
 %{_initrddir}/%{name}
 %{_sbindir}/%{name}-cron
+%ghost /var/www/moodle/web/lib/smarty 
+%ghost /var/www/moodle/web/lib/adodb
+%exclude %{moodlewebdir}/COPYING.txt
 
 %changelog
+* Tue Dec 08 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.7-1
+- Update to 1.9.7, BZ 544766.
+
+* Thu Nov 05 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.6-2
+- Reverted erroneous cron fix.
+
+* Thu Nov 05 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.6-1
+- Update to 1.9.6.
+- Make moodle-cron honor lock, BZ 533171.
+
+* Wed Sep 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.5-3
+- Using weekly snapshot downloaded 09/23/2009 for new PHP, BZ 525120
+- Added Urdu installer.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu May 14 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.5-1
+- Move symlink scripts from pretrans to post, pre.
+- 1.9.5.
+
 * Fri Apr 03 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-7
 - Move symlink scripts from pre to pretrans.
 - Corrented moodle-cron BZ 494090.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	11 Feb 2009 20:26:54 -0000	1.20
+++ sources	8 Dec 2009 17:05:22 -0000	1.21
@@ -1,4 +1,3 @@
-feed7be7f40292d2fe294150f2ab0afa  moodle-1.9.4.tgz
 3d2971423486ba5503b3b3e9ea2090db  af_utf8.zip
 30f9014a4e84e4b3ab55537fc568e947  ar_utf8.zip
 ae7533b212155cf43bb3cb24280bbc13  be_utf8.zip
@@ -73,7 +72,9 @@ c700dd1a55a3b8991430ac3f45a46f86  ta_lk_
 6d202edcba00c09fa7cb09aee8dd32c3  to_utf8.zip
 3677cacaaf37e493abc36fbc29c19823  tr_utf8.zip
 7c10ddba1cd7110c00bcd100b35c0ad8  uk_utf8.zip
+ba2222207b4fcae3ecd911508e915568  ur_utf8.zip
 9ca04547794a5b5e88247e8915624775  uz_utf8.zip
 31089008a31db97c283b0911ef9eae91  vi_utf8.zip
 c1c79d9af8ad9ff5feda7775d8178e23  zh_cn_utf8.zip
 8b2ba851407deb066d87bb4ac3204e25  zh_tw_utf8.zip
+6f0888279c5f86ccb7c578800cc3243a  moodle-1.9.7.tgz

More information about the fedora-extras-commits mailing list