From dc4b7d6a76ed8896d97a56319568862feaef11fd Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 07:02:55 +0100 Subject: [PATCH] remove requirement for hhvm [release 1.22.5-2mamba;Wed May 21 2014] --- ... => mediawiki-1.22.2-DefaultSettings.patch | 13 +++++--- mediawiki.spec | 33 ++++++++++++++----- 2 files changed, 32 insertions(+), 14 deletions(-) rename mediawiki-1.21.2-DefaultSettings.patch => mediawiki-1.22.2-DefaultSettings.patch (70%) diff --git a/mediawiki-1.21.2-DefaultSettings.patch b/mediawiki-1.22.2-DefaultSettings.patch similarity index 70% rename from mediawiki-1.21.2-DefaultSettings.patch rename to mediawiki-1.22.2-DefaultSettings.patch index 017ec41..7ed89cd 100644 --- a/mediawiki-1.21.2-DefaultSettings.patch +++ b/mediawiki-1.22.2-DefaultSettings.patch @@ -1,7 +1,7 @@ -diff -Nru mediawiki-1.21.2.orig/includes/DefaultSettings.php mediawiki-1.21.2/includes/DefaultSettings.php ---- mediawiki-1.21.2.orig/includes/DefaultSettings.php 2013-09-03 20:56:39.000000000 +0200 -+++ mediawiki-1.21.2/includes/DefaultSettings.php 2013-09-16 15:05:04.329722387 +0200 -@@ -3914,7 +3914,7 @@ +diff -Nru mediawiki-1.22.2.orig/includes/DefaultSettings.php mediawiki-1.22.2/includes/DefaultSettings.php +--- mediawiki-1.22.2.orig/includes/DefaultSettings.php 2014-01-28 01:06:33.000000000 +0100 ++++ mediawiki-1.22.2/includes/DefaultSettings.php 2014-02-22 17:36:12.352426268 +0100 +@@ -4141,7 +4141,7 @@ * Should editors be required to have a validated e-mail * address before being allowed to edit? */ @@ -10,7 +10,7 @@ diff -Nru mediawiki-1.21.2.orig/includes/DefaultSettings.php mediawiki-1.21.2/in /** * Permission keys given to users in each group. -@@ -3946,14 +3946,14 @@ +@@ -4173,9 +4173,9 @@ // Implicit group for all visitors $wgGroupPermissions['*']['createaccount'] = true; $wgGroupPermissions['*']['read'] = true; @@ -21,6 +21,9 @@ diff -Nru mediawiki-1.21.2.orig/includes/DefaultSettings.php mediawiki-1.21.2/in +$wgGroupPermissions['*']['createpage'] = false; +$wgGroupPermissions['*']['createtalk'] = false; $wgGroupPermissions['*']['writeapi'] = true; + $wgGroupPermissions['*']['editmyusercss'] = true; + $wgGroupPermissions['*']['editmyuserjs'] = true; +@@ -4187,7 +4187,7 @@ #$wgGroupPermissions['*']['patrolmarks'] = false; // let anons see what was patrolled // Implicit group for all logged-in accounts diff --git a/mediawiki.spec b/mediawiki.spec index d8b323d..027066b 100644 --- a/mediawiki.spec +++ b/mediawiki.spec @@ -10,8 +10,8 @@ %endif Name: %{?sitename:%sitename-}mediawiki%{?lang:-%lang} -Version: 1.21.2 -Release: 1mamba +Version: 1.22.5 +Release: 2mamba Summary: A collaborative editing software that runs Wikipedia and other projects Group: Applications/Web Vendor: openmamba @@ -24,10 +24,11 @@ Source2: mediawiki-AuthPress_LocalSettings.php Source3: mediawiki-theme-openmamba-%{openmamba_theme_ver}.tar.bz2 Source4: mediawiki-PasswordHash.php Source5: http://mediawiki.narod.ru/QPoll_0.7.0.tgz -Patch0: mediawiki-1.21.2-DefaultSettings.patch +Patch0: mediawiki-1.22.2-DefaultSettings.patch License: GPL +## AUTOBUILDREQ-BEGIN +## AUTOBUILDREQ-END Requires: apache-mod_php >= 5 -Requires: php-apc Requires: mysql >= 4 Requires: php-mysql Requires: diffutils @@ -53,7 +54,7 @@ This package contains the openmamba theme. %prep %setup -q -n mediawiki-%{version} -a3 -%patch0 -p1 +#%patch0 -p1 %build # FIXME: ocaml missing @@ -78,6 +79,8 @@ chmod 770 %{buildroot}%{installdir}/mw-config chmod 775 %{buildroot}%{installdir}/images #chmod 640 %{buildroot}%{installdir}/AdminSettings.sample +chmod -x %{buildroot}%{installdir}/maintenance/hiphop/run-server + install -d %{buildroot}%{_sysconfdir}/httpd/httpd.d cat > %{buildroot}%{_sysconfdir}/httpd/httpd.d/%{name}.conf << EOF Alias /wiki%{?lang:-%lang} %{installdir} @@ -121,12 +124,13 @@ fi %dir %{installdir} #%{installdir}/AdminSettings.sample #%{installdir}/Makefile -%attr(-,root,nobody) %{installdir}/mw-config +%attr(-,root,nobody) %dir %{installdir}/mw-config +%{installdir}/mw-config/* %attr(-,root,nobody) %{installdir}/images #%{installdir}/bin %{installdir}/CREDITS %{installdir}/cache/.htaccess -%{installdir}/composer.json +%{installdir}/composer-example.json %{installdir}/docs %{installdir}/extensions %{installdir}/includes @@ -134,14 +138,13 @@ fi #%{installdir}/locale %{installdir}/maintenance #%{installdir}/math -%{installdir}/mw-config %{installdir}/resources %{installdir}/skins %{installdir}/serialized #%{installdir}/install-utils.inc %{installdir}/*.php %{installdir}/*.php5 -%{installdir}/redirect.phtml +#%{installdir}/redirect.phtml %{installdir}/StartProfiler.sample %{installdir}/wiki.phtml %{installdir}/README.mediawiki @@ -156,6 +159,18 @@ fi %dir %{installdir}/skins/openmamba/* %changelog +* Wed May 21 2014 Silvan Calarco 1.22.5-2mamba +- remove requirement for hhvm + +* Mon Mar 31 2014 Automatic Build System 1.22.5-1mamba +- automatic version update by autodist + +* Sun Mar 23 2014 Automatic Build System 1.22.3-1mamba +- automatic version update by autodist + +* Sun Feb 23 2014 Automatic Build System 1.22.2-1mamba +- automatic version update by autodist + * Tue Sep 17 2013 Automatic Build System 1.21.2-1mamba - automatic version update by autodist