rpms/moodle/devel .cvsignore, 1.16, 1.17 moodle.spec, 1.43, 1.44 sources, 1.20, 1.21

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/moodle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21725

Modified Files:
	.cvsignore moodle.spec sources 
Log Message:
1.9.5, symlink script cleanup.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	11 Feb 2009 20:26:54 -0000	1.16
+++ .cvsignore	15 May 2009 16:37:02 -0000	1.17
@@ -1,4 +1,4 @@
-moodle-1.9.4.tgz
+moodle-1.9.5.tgz
 af_utf8.zip
 ar_utf8.zip
 be_utf8.zip


Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/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	15 May 2009 16:37:02 -0000	1.44
@@ -7,8 +7,8 @@
 %define __perl_provides %{nil}
 
 Name:           moodle
-Version:        1.9.4
-Release:        7%{?dist}
+Version:        1.9.5
+Release:        1%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -106,7 +106,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 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
@@ -1482,7 +1482,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 +1542,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 +1704,15 @@ 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
+* 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/devel/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	15 May 2009 16:37:02 -0000	1.21
@@ -1,4 +1,4 @@
-feed7be7f40292d2fe294150f2ab0afa  moodle-1.9.4.tgz
+60ec17b003eb75912a3ce362da7ac378  moodle-1.9.5.tgz
 3d2971423486ba5503b3b3e9ea2090db  af_utf8.zip
 30f9014a4e84e4b3ab55537fc568e947  ar_utf8.zip
 ae7533b212155cf43bb3cb24280bbc13  be_utf8.zip