From a730862f2da8f0b8dffa44e67cec2e7aef7e4a79edd224901602e666cc49b327 Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Fri, 11 Dec 2020 09:15:26 +0000 Subject: [PATCH] Accepting request 854820 from home:ecsos:server - Fix problem with apache_serverroot macro in Tumbleweed. OBS-URL: https://build.opensuse.org/request/show/854820 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/nextcloud?expand=0&rev=131 --- nextcloud.changes | 5 +++++ nextcloud.spec | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/nextcloud.changes b/nextcloud.changes index c56bfe7..42433d2 100644 --- a/nextcloud.changes +++ b/nextcloud.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 11 08:49:28 UTC 2020 - ecsos + +- Fix problem with apache_serverroot macro in Tumbleweed. + ------------------------------------------------------------------- Thu Dec 10 12:26:39 UTC 2020 - ecsos diff --git a/nextcloud.spec b/nextcloud.spec index 6fecc99..36dba55 100644 --- a/nextcloud.spec +++ b/nextcloud.spec @@ -18,7 +18,12 @@ # %if 0%{?suse_version} +# Tumbleweed has errors in apache-rpm-macros: apache_serverroot is /usr +%if 0%{?suse_version} > 1500 +%define apache_myserverroot /srv/www/htdocs +%else %define apache_myserverroot %{apache_serverroot}/htdocs +%endif %define apache_confdir %{apache_sysconfdir}/conf.d %define apache_docdir /usr/share/doc/packages %else