rpm/nextcloud
SHA256
1
0
Fork 0
forked from pool/nextcloud
Code Pull Requests Activity

Accepting request 793414 from home:oreinert:branches:server:php:applications

Browse Source 
- 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
This commit is contained in:
Eric Schirra 2020-04-12 20:03:35 +00:00 committed by Git OBS Bridge
parent 7ba4f6ead9
commit 2dbade356f
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nextcloud.changes
View File

@ -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>

12
nextcloud.spec
View File

@ -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