ignatenkobrain pushed to moodle (master). "2.9 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed May 20 12:16:58 UTC 2015
From 716c948f994725abcaf5828f2fe8f84fe778bd2b Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date: Wed, 20 May 2015 15:16:44 +0300
Subject: 2.9
Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
diff --git a/.gitignore b/.gitignore
index bde9441..9de3a83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -283,3 +283,4 @@ zh_tw_utf8.zip
/moodle-2.8.1.tgz
/moodle-2.8.3.tgz
/moodle-2.8.5.tgz
+/moodle-2.9.tgz
diff --git a/moodle.service b/moodle.service
new file mode 100644
index 0000000..ff7b21c
--- /dev/null
+++ b/moodle.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Enable the cron job for Moodle
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+Environment=LOCKFILE=/var/lock/subsys/moodle
+ExecStart=/usr/bin/touch $LOCKFILE
+ExecStop=/usr/bin/rm -f $LOCKFILE
+
+[Install]
+WantedBy=multi-user.target
diff --git a/moodle.spec b/moodle.spec
index a83296c..d3ee46b 100644
--- a/moodle.spec
+++ b/moodle.spec
@@ -6,19 +6,19 @@
%define __perl_provides %{nil}
Name: moodle
-Version: 2.8.5
+Version: 2.9
Release: 1%{?dist}
Summary: A Course Management System
Group: Applications/Publishing
License: GPLv2+
URL: http://moodle.org/
-Source0: http://download.moodle.org/stable22/%{name}-%{version}.tgz
+Source0: http://download.moodle.org/stable29/%{name}-%{version}.tgz
Source1: moodle.conf
Source2: moodle-config.php
Source3: moodle.cron
Source4: moodle-cron
-Source5: moodle.init
+Source5: moodle.sevice
Source6: moodle-README-rpm
#Patch0: moodle-CVE-2012-6087.patch
Patch1: moodle-2.5-unbundle-tcpdf.patch
@@ -26,7 +26,6 @@ Patch2: moodle-QuickForm.patch
# Elegantly handle removal of moxieplayer Flash binary in tinymce
# media plugin (see "Drop precompiled flash" in install)
#Patch3: tinymce-3.5.8-no_moxieplayer.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: unzip
@@ -50,20 +49,19 @@ Requires: php-tcpdf-gnu-free-serif-fonts
Requires: php-tcpdf-gnu-free-sans-fonts
Requires: php-tcpdf-gnu-free-mono-fonts
Requires: crontabs
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-
+BuildRequires: systemd
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
%description
Moodle is a course management system (CMS) - a free, Open Source software
package designed using sound pedagogical principles, to help educators create
effective online learning communities.
-
%prep
-%setup -q -n %{name}
+%autosetup -n %{name}
cp %{SOURCE6} README-rpm
#%patch0 -p0
@@ -92,69 +90,66 @@ rm lib/phpmailer/language/phpmailer.lang-fo.php
find . -type f -name '*.swf' | xargs rm -f
%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{moodlewebdir}
-mkdir -p $RPM_BUILD_ROOT%{moodledatadir}
-cp -a * $RPM_BUILD_ROOT%{moodlewebdir}
-rm $RPM_BUILD_ROOT%{moodlewebdir}/README*
-install -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/moodle.conf
-install -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{moodlewebdir}/config.php
-install -p -D -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/moodle
-install -p -D -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_sbindir}/moodle-cron
-install -p -D -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/moodle
-find $RPM_BUILD_ROOT -name \*.mimetex-\* -exec rm {} \;
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{moodlewebdir}
+mkdir -p %{buildroot}%{moodledatadir}
+cp -a * %{buildroot}%{moodlewebdir}
+rm %{buildroot}%{moodlewebdir}/README*
+install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/moodle.conf
+install -p -D -m 0644 %{SOURCE2} %{buildroot}%{moodlewebdir}/config.php
+install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/cron.d/moodle
+install -p -D -m 0755 %{SOURCE4} %{buildroot}%{_sbindir}/moodle-cron
+install -p -D -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/moodle.service
+find %{buildroot} -name \*.mimetex-\* -exec rm {} \;
#use system smarty
-rm -rf $RPM_BUILD_ROOT/var/www/moodle/web/lib/smarty
-ln -s /usr/share/php/Smarty/ $RPM_BUILD_ROOT/var/www/moodle/web/lib/smarty
+rm -rf %{buildroot}/var/www/moodle/web/lib/smarty
+ln -s /usr/share/php/Smarty/ %{buildroot}/var/www/moodle/web/lib/smarty
#use system adodb
-rm -rf $RPM_BUILD_ROOT/var/www/moodle/web/lib/adodb
-ln -s /usr/share/php/adodb/ $RPM_BUILD_ROOT/var/www/moodle/web/lib/adodb
+rm -rf %{buildroot}/var/www/moodle/web/lib/adodb
+ln -s /usr/share/php/adodb/ %{buildroot}/var/www/moodle/web/lib/adodb
#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
+rm -f %{buildroot}%{moodlewebdir}/lib/default.ttf
+ln -s /usr/share/fonts/gnu-free/FreeSans.ttf %{buildroot}%{moodlewebdir}/lib/default.ttf
#use system php-pear-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
+rm -rf %{buildroot}/var/www/moodle/web/auth/cas/CAS
+ln -s /usr/share/pear/ %{buildroot}/var/www/moodle/web/auth/cas/CAS
#use system markdown
-rm -rf $RPM_BUILD_ROOT/var/www/moodle/web/lib/markdown.php
-ln -s /usr/share/php/markdown.php $RPM_BUILD_ROOT/var/www/moodle/web/lib/markdown.php
+rm -rf %{buildroot}/var/www/moodle/web/lib/markdown.php
+ln -s /usr/share/php/markdown.php %{buildroot}/var/www/moodle/web/lib/markdown.php
#use system php-pear-Auth-RADIUS
-rm -rf $RPM_BUILD_ROOT/var/www/moodle/web/lib/pear/Auth/RADIUS.php
-ln -s /usr/share/pear/Auth/RADIUS.php $RPM_BUILD_ROOT/var/www/moodle/web/lib/pear/Auth/RADIUS.php
+rm -rf %{buildroot}/var/www/moodle/web/lib/pear/Auth/RADIUS.php
+ln -s /usr/share/pear/Auth/RADIUS.php %{buildroot}/var/www/moodle/web/lib/pear/Auth/RADIUS.php
#use system php-pear-Crypt-CHAP
-rm -rf $RPM_BUILD_ROOT/var/www/moodle/web/lib/pear/Crypt/CHAP.php
-ln -s /usr/share/pear/Crypt/CHAP.php $RPM_BUILD_ROOT/var/www/moodle/web/lib/pear/Crypt/CHAP.php
+rm -rf %{buildroot}/var/www/moodle/web/lib/pear/Crypt/CHAP.php
+ln -s /usr/share/pear/Crypt/CHAP.php %{buildroot}/var/www/moodle/web/lib/pear/Crypt/CHAP.php
#use system php-pear-HTML-Common
-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
+rm -rf %{buildroot}/var/www/moodle/web/lib/pear/HTML/Common.php
+ln -s /usr/share/pear/HTML/Common.php %{buildroot}/var/www/moodle/web/lib/pear/HTML/Common.php
#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
+mv %{buildroot}/var/www/moodle/web/lib/pear/HTML/QuickForm/DHTMLRulesTableless.php %{buildroot}/var/www/moodle/web/lib/pear/
+mv %{buildroot}/var/www/moodle/web/lib/pear/HTML/QuickForm/Renderer/Tableless.php %{buildroot}/var/www/moodle/web/lib/pear/
+rm -rf %{buildroot}/var/www/moodle/web/lib/pear/HTML/QuickForm*
+ln -s /usr/share/pear/HTML/QuickForm %{buildroot}/var/www/moodle/web/lib/pear/HTML/QuickForm
+ln -s /usr/share/pear/HTML/QuickForm.php %{buildroot}/var/www/moodle/web/lib/pear/HTML/QuickForm.php
#use system php-pear-OLE
-rm -rf $RPM_BUILD_ROOT/var/www/moodle/web/lib/pear/OLE
-ln -s /usr/share/pear/OLE $RPM_BUILD_ROOT/var/www/moodle/web/lib/pear/OLE
+rm -rf %{buildroot}/var/www/moodle/web/lib/pear/OLE
+ln -s /usr/share/pear/OLE %{buildroot}/var/www/moodle/web/lib/pear/OLE
#use system php-tcpdf
-rm -rf $RPM_BUILD_ROOT/var/www/moodle/web/lib/tcpdf
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}/var/www/moodle/web/lib/tcpdf
%post
-/sbin/chkconfig --add %{name}
+%systemd_post moodle.service
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 && \
@@ -192,10 +187,10 @@ if [ ! -L /var/www/moodle/web/lib/pear/OLE ]; then
fi
%preun
-if [ $1 = 0 ]; then
- /sbin/service %{name} stop >/dev/null 2>&1
- /sbin/chkconfig --del %{name}
-fi
+%systemd_preun moodle.service
+
+%postun
+%systemd_postun_with_restart moodle.service
%pre
if [ -h /var/www/moodle/web/lib/magpie ]; then
@@ -207,8 +202,8 @@ if [ -L /var/www/moodle/web/auth/cas ]; then
fi
%files
-%defattr(-,root,root,-)
-%doc README* COPYING.txt TRADEMARK.txt local/readme.txt
+%license COPYING.txt
+%doc README* TRADEMARK.txt local/readme.txt
%dir %{_var}/www/moodle
%config(noreplace) %{moodlewebdir}/config.php
#%config(noreplace) %{moodlewebdir}/theme/formal_white/config.php
@@ -234,11 +229,16 @@ 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/smarty
%ghost /var/www/moodle/web/lib/adodb
%exclude %{moodlewebdir}/COPYING.txt
%changelog
+* Wed May 20 2015 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 2.9-1
+- 2.9
+- update RPM macroses
+- provide systemd service instead of init
+
* Tue Mar 24 2015 Jon Ciesla <limburgher at gmail.com> - 2.8.5-1
- Latest upstream release.
diff --git a/sources b/sources
index da4054b..9f0ba5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9463842e06eec56733b74f7013f33b1d moodle-2.8.5.tgz
+0fe45f8eed6a995eaf9d385cbce40176 moodle-2.9.tgz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/moodle.git/commit/?h=master&id=716c948f994725abcaf5828f2fe8f84fe778bd2b
More information about the scm-commits
mailing list