rpms/moodle/F-10 moodle.spec,1.40,1.41

[Jon Ciesla]

Author: limb

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

Modified Files:
	moodle.spec 
Log Message:
Font deps fix.



Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-10/moodle.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- moodle.spec	1 Apr 2009 19:55:34 -0000	1.40
+++ moodle.spec	2 Apr 2009 19:55:34 -0000	1.41
@@ -8,7 +8,7 @@
 
 Name:           moodle
 Version:        1.9.4
-Release:        6%{?dist}
+Release:        6.1%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -115,7 +115,7 @@
 Requires:	php-Smarty
 Requires:	php-adodb
 #Requires:	php-magpierss
-Requires:	gnu-free-sans-fonts
+Requires:	freefont
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -747,7 +747,7 @@
 Summary:        Moodle language pack for Khmer
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
-Requires:	khmeros-base-fonts
+Requires:	khmeros-fonts-base
 
 %description    km
 This package contains the files needed to display Moodle in Khmer.
@@ -1114,7 +1114,7 @@
 Summary:        Moodle language pack for Samoan
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
-Requires:	dejavu-sans-fonts
+Requires:	dejavu-fonts
 
 %description    sm
 This package contains the files needed to display Moodle in Samoan.
@@ -1273,7 +1273,7 @@
 Summary:        Moodle language pack for Tonga
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
-Requires:	dejavu-sans-fonts
+Requires:	dejavu-fonts
 
 %description    to
 This package contains the files needed to display Moodle in Tonga.
@@ -1530,9 +1530,9 @@
 
 #Symlink to FreeSans, to save space.
 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
+ln -s /usr/share/fonts/freefont/FreeSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
 
-#symlink to khmeros-base-fonts
+#symlink to khmeros-fonts-base
 rm -f $RPM_BUILD_ROOT%{moodlewebdir}/lang/km_utf8/fonts/default.ttf
 ln -s /usr/share/fonts/khmeros/KhmerOS_sys.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lang/km_utf8/fonts/default.ttf
 
@@ -1694,6 +1694,9 @@
 %{_sbindir}/%{name}-cron
 
 %changelog
+* Thu Apr 02 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-6.1
+- Fix broken font deps.
+
 * Wed Apr 01 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-6
 - Patch for CVE-2009-1171, BZ 493109.