From 2dbade356f7a07fa801d980961ce29e3b65fe9a867d451348dbc31c66e324fac Mon Sep 17 00:00:00 2001
From: Eric Schirra <ecsos@schirra.net>
Date: Sun, 12 Apr 2020 20:03:35 +0000
Subject: [PATCH] Accepting request 793414 from
 home:oreinert:branches:server:php:applications

- Make core/js/mimetypelist.js writable
  * Fixes "occ maintenance:mimetype:update-js" command
  * Allows apps to register new mimetypes
- Make core/img/filetypes/ writable
  * Allows apps to register new file icons
- Use standard a2enmod command to manipulate Apache module list

The first two items are bugfixes. Without them, apps that define new file types (e.g., the MindMap app) cause issues, even to the point of breaking the Activity page.
The last item is cosmetic, but I figure the use of a dedicated purpose-built command is easier to read and maintain than custom Perl scripts?

OBS-URL: https://build.opensuse.org/request/show/793414
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/nextcloud?expand=0&rev=107
---
 nextcloud.changes | 10 ++++++++++
 nextcloud.spec    | 12 ++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/nextcloud.changes b/nextcloud.changes
index 5d23649..b417b07 100644
--- a/nextcloud.changes
+++ b/nextcloud.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Apr 12 13:20:14 UTC 2020 - Olav Reinert <seroton10@gmail.com>
+
+- Make core/js/mimetypelist.js writable
+  * Fixes "occ maintenance:mimetype:update-js" command
+  * Allows apps to register new mimetypes
+- Make core/img/filetypes/ writable
+  * Allows apps to register new file icons
+- Use standard a2enmod command to manipulate Apache module list
+
 -------------------------------------------------------------------
 Sun Mar 29 20:54:25 UTC 2020 - Olav Reinert <seroton10@gmail.com>
 
diff --git a/nextcloud.spec b/nextcloud.spec
index 8864f33..8e58a7d 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -251,15 +251,9 @@ fi
 if [ $1 -eq 1 ]; then
 %if 0%{?suse_version}
 %if 0%{?suse_version} >= 1500
-# make sure php7 is not in APACHE_MODULES, so that we don't create dups.
-perl -pani -e 's@^(APACHE_MODULES=".*)\bphp7\b@$1@' /etc/sysconfig/apache2
-# add php7 to APACHE_MODULES
-perl -pani -e 's@^(APACHE_MODULES=")@${1}php7 @' /etc/sysconfig/apache2
+a2enmod php7
 %else
-# make sure php5 is not in APACHE_MODULES, so that we don't create dups.
-perl -pani -e 's@^(APACHE_MODULES=".*)\bphp5\b@$1@' /etc/sysconfig/apache2
-# add php5 to APACHE_MODULES
-perl -pani -e 's@^(APACHE_MODULES=")@${1}php5 @' /etc/sysconfig/apache2
+a2enmod php5
 %endif
 %endif
 fi
@@ -314,6 +308,8 @@ rm -f %{statedir}/occ_maintenance_mode_during_nextcloud_install
 %config(noreplace) %{apache_serverroot}/%{name}/.user.ini
 %defattr(664,wwwrun,www,775)
 %{apache_serverroot}/%{name}/apps
+%{apache_serverroot}/%{name}/core/js/mimetypelist.js
+%dir %{apache_serverroot}/%{name}/core/img/filetypes
 %defattr(660,wwwrun,www,770)
 %{apache_serverroot}/%{name}/config
 %{apache_serverroot}/%{name}/data