From 9c383c6f57fa553584b61f1d24ce1a5f9d7e65eb08c56fb317d4237a4202c03e Mon Sep 17 00:00:00 2001 From: James Oakley Date: Sat, 16 Mar 2019 00:52:40 +0000 Subject: [PATCH] - Use pkg-config instead of pg_config as it was removed in postgres11-devel OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=80 --- uwsgi-2.0.18-postgresql-config.patch | 16 ++++++++++++++++ uwsgi.changes | 5 +++++ uwsgi.spec | 7 +++++-- 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 uwsgi-2.0.18-postgresql-config.patch diff --git a/uwsgi-2.0.18-postgresql-config.patch b/uwsgi-2.0.18-postgresql-config.patch new file mode 100644 index 0000000..73a83ca --- /dev/null +++ b/uwsgi-2.0.18-postgresql-config.patch @@ -0,0 +1,16 @@ +--- a/plugins/emperor_pg/uwsgiplugin.py ++++ b/plugins/emperor_pg/uwsgiplugin.py +@@ -2,11 +2,8 @@ import os + + NAME = 'emperor_pg' + +-CFLAGS = ['-I' + os.popen('pg_config --includedir').read().rstrip()] ++CFLAGS = os.popen('pkg-config --cflags libpq').read().rstrip().split() + LDFLAGS = [] +-LIBS = [ +- '-L' + os.popen('pg_config --libdir').read().rstrip(), +- '-lpq' +-] ++LIBS = os.popen('pkg-config --libs libpq').read().rstrip().split() + + GCC_LIST = ['emperor_pg'] diff --git a/uwsgi.changes b/uwsgi.changes index 4c36b9c..a4883ae 100644 --- a/uwsgi.changes +++ b/uwsgi.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Mar 16 00:45:25 UTC 2019 - James Oakley + +- Use pkg-config instead of pg_config as it was removed in postgres11-devel + ------------------------------------------------------------------- Sat Feb 9 16:19:37 UTC 2019 - Michael Ströder diff --git a/uwsgi.spec b/uwsgi.spec index 624c2d1..725a6bd 100644 --- a/uwsgi.spec +++ b/uwsgi.spec @@ -1,7 +1,7 @@ # # spec file for package uwsgi # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -40,6 +40,8 @@ Patch1: uwsgi-2.0.12-no-LD_RUN_PATH.patch Patch2: uwsgi-1.9.13-objc_gc-no-fobjc-gc.patch # PATCH-FIX-OPENSUSE uwsgi-1.9.11-systemd_logger-old_systemd.patch - Older systemd in 12.2 does not implicity include syslog.h 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 @@ -441,6 +443,7 @@ This package contains support for PHP version 7. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # Generate a config that builds all plugins except for examples and stuff we # can't satisfy the requirements for or are just broken excluded_plugins=""