diff --git a/mediawiki.spec b/mediawiki.spec index 1fe9a41..ee9bf50 100644 --- a/mediawiki.spec +++ b/mediawiki.spec @@ -11,7 +11,7 @@ Name: %{?sitename:%sitename-}mediawiki%{?lang:-%lang} Version: 1.24.1 -Release: 1mamba +Release: 2mamba Summary: A collaborative editing software that runs Wikipedia and other projects Group: Applications/Web Vendor: openmamba @@ -97,6 +97,9 @@ install %{SOURCE4} %{buildroot}%{installdir}/includes/PasswordHash.php tar -xzf %{SOURCE5} -C %{buildroot}%{installdir}/extensions +# FIXME: quick workaround for Apache error on images directory due to RewriteEngine on +rm -f %{buildroot}%{installdir}/images/.htaccess + %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -105,8 +108,8 @@ if [ $1 -ge 1 ]; then service httpd condrestart fi -# update (AdminSettings.php have to contain database password) -if [ $1 -gt 1 ] && [ -e %{installdir}/AdminSettings.php ]; then +# update (LocalSettings.php have to contain database password) +if [ $1 -gt 1 ] && [ -e %{installdir}/LocalSettings.php ]; then /usr/bin/php %{installdir}/maintenance/update.php --quick || true fi : @@ -158,6 +161,9 @@ fi %dir %{installdir}/skins/openmamba/* %changelog +* Tue Jan 27 2015 Silvan Calarco 1.24.1-2mamba +- fix db update on upgrade and remove .htaccess in images dir as a workaround for Apache error + * Thu Dec 18 2014 Automatic Build System 1.24.1-1mamba - automatic update by autodist