From 91b981b27fe5489dcdec5ef767220d0630c48228077c748e84506e153631aab6 Mon Sep 17 00:00:00 2001 From: James Oakley Date: Thu, 3 Dec 2020 11:57:44 +0000 Subject: [PATCH] Accepting request 852360 from home:pgajdos - use system apache rpm macros OBS-URL: https://build.opensuse.org/request/show/852360 OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=98 --- uwsgi.changes | 5 +++++ uwsgi.spec | 12 +++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/uwsgi.changes b/uwsgi.changes index 47659a5..d7ec1ba 100644 --- a/uwsgi.changes +++ b/uwsgi.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 1 13:59:23 UTC 2020 - pgajdos@suse.com + +- use system apache rpm macros + ------------------------------------------------------------------- Thu Nov 26 18:51:29 UTC 2020 - Dirk Mueller diff --git a/uwsgi.spec b/uwsgi.spec index e5f6fc8..017577d 100644 --- a/uwsgi.spec +++ b/uwsgi.spec @@ -43,13 +43,7 @@ Patch2: uwsgi-1.9.13-objc_gc-no-fobjc-gc.patch Patch3: uwsgi-1.9.11-systemd_logger-old_systemd.patch # PATCH-FIX-OPENSUSE uwsgi-2.0.18-postgresql-config.patch - Use pkg-config instead of pg_config Patch4: uwsgi-2.0.18-postgresql-config.patch -%define apache_branch %(rpm -q --qf %%{version} apache2 | grep -E -o "2\\.[0-9]+") -%if "%{apache_branch}" == "2.4" - %define apxs %{_bindir}/apxs2 -%else - %define apxs %{_sbindir}/apxs2 -%endif -%define apache_libexecdir %(%{apxs} -q LIBEXECDIR) +BuildRequires: apache-rpm-macros %if 0%{suse_version} < 1500 BuildRequires: apache2-devel %else @@ -534,9 +528,9 @@ python3 uwsgiconfig.py --plugin plugins/python opensuse python3 # Build Apache modules %if 0%{suse_version} < 1500 -%{apxs} -c apache2/mod_proxy_uwsgi.c +%{apache_apxs} -c apache2/mod_proxy_uwsgi.c %endif -%{apxs} -c apache2/mod_uwsgi.c +%{apache_apxs} -c apache2/mod_uwsgi.c # Build php7 plugin %if 0%{?suse_version} > 1320