1
0

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
This commit is contained in:
Martin Pluskal 2020-06-08 08:55:00 +00:00 committed by Git OBS Bridge
parent b9e17795b4
commit 87ee4619d0
2 changed files with 27 additions and 11 deletions

View File

@ -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> Mon Feb 3 16:29:38 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -49,24 +49,28 @@ BuildRequires: pkg-config
BuildRequires: ghostscript-core BuildRequires: ghostscript-core
%endif %endif
BuildRequires: asciidoc BuildRequires: asciidoc
%if 0%{?suse_version} > 1500
BuildRequires: gcc9
BuildRequires: gcc9-c++
%endif
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: xmlto BuildRequires: xmlto
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
Recommends: simple-obfs Recommends: shadowsocks-v2ray-plugin
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_ordering} %{?systemd_ordering}
%description %description
shadowsocks-libev is a lightweight secured SOCKS5 proxy shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices and
for embedded devices and low-end boxes. low-end boxes.
%package -n lib%{name}%{libver} %package -n lib%{name}%{libver}
Summary: Libev port of Shadowsocks Summary: Libev port of Shadowsocks
Group: System/Libraries Group: System/Libraries
%description -n lib%{name}%{libver} %description -n lib%{name}%{libver}
shadowsocks-libev is a lightweight secured SOCKS5 proxy shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices and
for embedded devices and low-end boxes. low-end boxes.
This package provides libraries for it. This package provides libraries for it.
@ -77,8 +81,8 @@ Requires: %{name} = %{version}
BuildArch: noarch BuildArch: noarch
%description doc %description doc
shadowsocks-libev is a lightweight secured SOCKS5 proxy shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices and
for embedded devices and low-end boxes. low-end boxes.
This package provides Documents for it. This package provides Documents for it.
@ -88,8 +92,8 @@ Group: Development/Libraries/C and C++
Requires: lib%{name}%{libver} = %{version} Requires: lib%{name}%{libver} = %{version}
%description devel %description devel
shadowsocks-libev is a lightweight secured SOCKS5 proxy shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices and
for embedded devices and low-end boxes. low-end boxes.
This package provides development headers for it. This package provides development headers for it.
@ -97,8 +101,14 @@ This package provides development headers for it.
%setup -q %setup -q
%build %build
%configure --enable-shared %configure \
make %{?_smp_mflags} V=1 %if 0%{?suse_version} > 1500
CC=gcc-9 \
CXX=g++-9 \
%endif
--enable-shared
%make_build
%install %install
%make_install %make_install