From 87ee4619d0ea9f88662849656a9f5a98c2552643dfec24e6ad1b9996c88a9f35 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Mon, 8 Jun 2020 08:55:00 +0000
Subject: [PATCH] Accepting request 812243 from
 home:hillwood:branches:server:proxy

- Update Recommends tag: use shadowsocks-v2ray-plugin instead of simple-obfs
- Fix build on Tumbleweed: don't use gcc10!

OBS-URL: https://build.opensuse.org/request/show/812243
OBS-URL: https://build.opensuse.org/package/show/server:proxy/shadowsocks-libev?expand=0&rev=40
---
 shadowsocks-libev.changes |  6 ++++++
 shadowsocks-libev.spec    | 32 +++++++++++++++++++++-----------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/shadowsocks-libev.changes b/shadowsocks-libev.changes
index a93c6f8..21c62b8 100644
--- a/shadowsocks-libev.changes
+++ b/shadowsocks-libev.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Jun  7 11:16:33 UTC 2020 - opensuse-packaging <opensuse-packaging@opensuse.org>
+
+- Update Recommends tag: use shadowsocks-v2ray-plugin instead of simple-obfs 
+- Fix build on Tumbleweed: don't use gcc10!
+
 -------------------------------------------------------------------
 Mon Feb  3 16:29:38 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/shadowsocks-libev.spec b/shadowsocks-libev.spec
index f28c0cb..5780727 100644
--- a/shadowsocks-libev.spec
+++ b/shadowsocks-libev.spec
@@ -49,24 +49,28 @@ BuildRequires:  pkg-config
 BuildRequires:  ghostscript-core
 %endif
 BuildRequires:  asciidoc
+%if 0%{?suse_version} > 1500 
+BuildRequires:  gcc9
+BuildRequires:  gcc9-c++
+%endif
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  xmlto
 BuildRequires:  pkgconfig(systemd)
-Recommends:     simple-obfs
+Recommends:     shadowsocks-v2ray-plugin
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?systemd_ordering}
 
 %description
-shadowsocks-libev is a lightweight secured SOCKS5 proxy
-for embedded devices and low-end boxes.
+shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices and
+low-end boxes.
 
 %package -n lib%{name}%{libver}
 Summary:        Libev port of Shadowsocks
 Group:          System/Libraries
 
 %description -n lib%{name}%{libver}
-shadowsocks-libev is a lightweight secured SOCKS5 proxy
-for embedded devices and low-end boxes.
+shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices and
+low-end boxes.
 
 This package provides libraries for it.
 
@@ -77,8 +81,8 @@ Requires:       %{name} = %{version}
 BuildArch:      noarch
 
 %description doc
-shadowsocks-libev is a lightweight secured SOCKS5 proxy
-for embedded devices and low-end boxes.
+shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices and
+low-end boxes.
 
 This package provides Documents for it.
 
@@ -88,8 +92,8 @@ Group:          Development/Libraries/C and C++
 Requires:       lib%{name}%{libver} = %{version}
 
 %description devel
-shadowsocks-libev is a lightweight secured SOCKS5 proxy
-for embedded devices and low-end boxes.
+shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices and
+low-end boxes.
 
 This package provides development headers for it.
 
@@ -97,8 +101,14 @@ This package provides development headers for it.
 %setup -q
 
 %build
-%configure --enable-shared
-make %{?_smp_mflags} V=1
+%configure \
+%if 0%{?suse_version} > 1500 
+           CC=gcc-9 \
+           CXX=g++-9 \
+%endif
+           --enable-shared 
+
+%make_build
 
 %install
 %make_install