From 07b18ace3a78b2ca21c21a6bb8a1301b498bea30b69ad789a708d5f8070465a2 Mon Sep 17 00:00:00 2001 From: Arjen de Korte Date: Thu, 10 Dec 2020 07:47:16 +0000 Subject: [PATCH] Accepting request 852498 from home:pgajdos - use system apache rpm macros OBS-URL: https://build.opensuse.org/request/show/852498 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/roundcubemail?expand=0&rev=149 --- roundcubemail.changes | 5 +++++ roundcubemail.spec | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/roundcubemail.changes b/roundcubemail.changes index 8871df5..ab59f4f 100644 --- a/roundcubemail.changes +++ b/roundcubemail.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 1 14:37:42 UTC 2020 - pgajdos@suse.com + +- use system apache rpm macros + ------------------------------------------------------------------- Mon Sep 28 07:38:28 UTC 2020 - Michael Ströder diff --git a/roundcubemail.spec b/roundcubemail.spec index 4f6a05c..673572a 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -16,8 +16,6 @@ # -%define apache_serverroot %(%{_sbindir}/apxs2 -q DATADIR) -%define apache_sysconfdir %(%{_sbindir}/apxs2 -q SYSCONFDIR) %define roundcubepath %{apache_serverroot}/%{name} %define roundcubeconfigpath %{_sysconfdir}/%{name} %define php_major_version %(php -r "echo PHP_MAJOR_VERSION;") @@ -39,8 +37,8 @@ Source7: https://github.com/roundcube/%{name}/releases/download/%{version Source8: robots.txt # PATCH-FIX-OPENSUSE roundcubemail-config_dir.patch -- use the general config directory /etc Patch0: %{name}-config_dir.patch -BuildRequires: apache2-devel -BuildRequires: pcre-devel +BuildRequires: apache-rpm-macros +BuildRequires: apache2 BuildRequires: php Requires: http_daemon Requires: mod_php_any >= 5.4