From 0534eecca2c40a0c4fa18e1db8b6634ee40ea26bd26cafd85705537bf08e3ee8 Mon Sep 17 00:00:00 2001
From: Marguerite Su <i@marguerite.su>
Date: Tue, 10 Mar 2020 08:10:28 +0000
Subject: [PATCH] Accepting request 782999 from home:pgajdos

- disable geoip plugin [bsc#1156199]

OBS-URL: https://build.opensuse.org/request/show/782999
OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=87
---
 uwsgi.changes |  5 +++++
 uwsgi.spec    | 22 ++++------------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/uwsgi.changes b/uwsgi.changes
index 472d600..9b89f6a 100644
--- a/uwsgi.changes
+++ b/uwsgi.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar  9 14:24:36 UTC 2020 - pgajdos@suse.com
+
+- disable geoip plugin [bsc#1156199]
+
 -------------------------------------------------------------------
 Thu Dec 19 14:54:12 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/uwsgi.spec b/uwsgi.spec
index 1e4351d..9cddbaf 100644
--- a/uwsgi.spec
+++ b/uwsgi.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package uwsgi
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -65,7 +65,6 @@ BuildRequires:  glusterfs-devel
 #BuildRequires:  go
 BuildRequires:  java-devel
 #BuildRequires:  krb5-devel
-BuildRequires:  libGeoIP-devel
 BuildRequires:  libattr-devel
 BuildRequires:  libcap-devel
 BuildRequires:  libcurl-devel
@@ -206,18 +205,6 @@ This package contains an emperor plugin allowing for configuration of
 applications (vassals) via ZeroMQ.
 
 
-%package geoip
-Summary:        GeoIP Plugin for uWSGI
-Group:          Productivity/Networking/Web/Servers
-Requires:       %{name} = %{version}
-Requires:       %{name}-python = %{version}
-
-%description geoip
-uWSGI is a self-healing application container server coded in pure C.
-
-This package contains support for GeoIP routing.
-
-
 %package gevent
 Summary:        Gevent Plugin for uWSGI
 Group:          Productivity/Networking/Web/Servers
@@ -493,6 +480,9 @@ excluded_plugins="$excluded_plugins libtcc"
 # matheval is deprecated
 excluded_plugins="$excluded_plugins matheval"
 
+# bsc#1156199 - python-txtorcon: GeoIP support is discontinued 
+excluded_plugins="$excluded_plugins geoip"
+
 # V8 is not yet available on all platforms and is broken in the v8 versions in
 # 13.1+
 %ifarch %{ix86} x86_64 %{arm} aarch64 ppc ppc64 ppc64le
@@ -683,10 +673,6 @@ ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rcuwsgi
 %defattr(-,root,root,-)
 %{_libdir}/uwsgi/emperor_zeromq_plugin.so
 
-%files geoip
-%defattr(-,root,root,-)
-%{_libdir}/uwsgi/geoip_plugin.so
-
 %files gevent
 %defattr(-,root,root,-)
 %{_libdir}/uwsgi/gevent_plugin.so