From 7d933eec6613a8aab58a639ff68c202bcebbde930afb7fe54937695a2eb65355 Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Mon, 25 Mar 2019 14:10:12 +0000 Subject: [PATCH] Accepting request 688276 from home:hillwood:branches:server:proxy - Fix postun. OBS-URL: https://build.opensuse.org/request/show/688276 OBS-URL: https://build.opensuse.org/package/show/server:proxy/shadowsocks-libev?expand=0&rev=24 --- shadowsocks-libev.changes | 5 +++++ shadowsocks-libev.spec | 39 ++++++++++++++++++++++++++------------- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/shadowsocks-libev.changes b/shadowsocks-libev.changes index 6abe39a..2511a24 100644 --- a/shadowsocks-libev.changes +++ b/shadowsocks-libev.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 25 14:01:01 UTC 2019 - Hillwood Yang + +- Fix postun. + ------------------------------------------------------------------- Mon Mar 4 06:28:42 UTC 2019 - Michael Du diff --git a/shadowsocks-libev.spec b/shadowsocks-libev.spec index dec9c12..57add00 100644 --- a/shadowsocks-libev.spec +++ b/shadowsocks-libev.spec @@ -52,8 +52,9 @@ BuildRequires: asciidoc BuildRequires: systemd BuildRequires: xmlto Recommends: simple-obfs -%{?systemd_requires} +BuildRequires: systemd-rpm-macros BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?systemd_ordering} %description shadowsocks-libev is a lightweight secured SOCKS5 proxy @@ -123,24 +124,36 @@ ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcshadowsocks-libev-redir ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcshadowsocks-libev-tunnel %pre -%{service_add_pre %{name}-server.service %{name}-client.service \ - %{name}-manager.service %{name}-nat.service %{name}-redir.service \ - %{name}-tunnel.service} +%service_add_pre %{name}-server.service +%service_add_pre %{name}-client.service +%service_add_pre %{name}-manager.service +%service_add_pre %{name}-nat.service +%service_add_pre %{name}-redir.service +%service_add_pre %{name}-tunnel.service %post -%{service_add_post %{name}-server.service %{name}-client.service \ - %{name}-manager.service %{name}-nat.service %{name}-redir.service \ - %{name}-tunnel.service} +%service_add_post %{name}-server.service +%service_add_post %{name}-client.service +%service_add_post %{name}-manager.service +%service_add_post %{name}-nat.service +%service_add_post %{name}-redir.service +%service_add_post %{name}-tunnel.service %preun -%{service_del_preun %{name}-server.service %{name}-client.service \ - %{name}-manager.service %{name}-nat.service %{name}-redir.service \ - %{name}-tunnel.service} +%service_del_preun %{name}-server.service +%service_del_preun %{name}-client.service +%service_del_preun %{name}-manager.service +%service_del_preun %{name}-nat.service +%service_del_preun %{name}-redir.service +%service_del_preun %{name}-tunnel.service %postun -%{service_del_postun %{name}-server.service %{name}-client.service \ - %{name}-manager.service %{name}-nat.service %{name}-redir.service \ - %{name}-tunnel.service} +%service_del_postun %{name}-server.service +%service_del_postun %{name}-client.service +%service_del_postun %{name}-manager.service +%service_del_postun %{name}-nat.service +%service_del_postun %{name}-redir.service +%service_del_postun %{name}-tunnel.service %post -n lib%{name}2 -p /sbin/ldconfig