From 4e2014fc9ec2022a1ce8a91505d880eac991b158cd453ed91986c54748eed930 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Wed, 18 May 2016 09:23:45 +0000 Subject: [PATCH] Accepting request 396577 from home:jengelh:branches:network something like this (untested) - Drop unnecessary systemd install-time dependencies. [bnc#980389] Only pass template units to preun (disable); no other actions are defined for them. OBS-URL: https://build.opensuse.org/request/show/396577 OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=62 --- syncthing.changes | 7 +++++++ syncthing.spec | 7 +++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/syncthing.changes b/syncthing.changes index 908d1d0..d11677e 100644 --- a/syncthing.changes +++ b/syncthing.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 18 08:54:32 UTC 2016 - jengelh@inai.de + +- Drop unnecessary systemd install-time dependencies. [bnc#980389] + Only pass template units to preun (disable); no other actions + are defined for them. + ------------------------------------------------------------------- Tue May 17 17:13:51 UTC 2016 - sor.alexei@meowr.ru diff --git a/syncthing.spec b/syncthing.spec index 696f29c..da44d3e 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -28,7 +28,6 @@ Source1: %{name}.firewall BuildRequires: go >= 1.3 BuildRequires: systemd BuildRequires: systemd-rpm-macros -%{?systemd_requires} %description Syncthing replaces proprietary sync and cloud services with @@ -73,10 +72,10 @@ install -Dm 0644 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %pre -%service_add_pre %{name}@.service %{name}-resume.service +%service_add_pre %{name}-resume.service %post -%service_add_post %{name}@.service %{name}-resume.service +%service_add_post %{name}-resume.service %if 0%{?suse_version} > 1320 %systemd_user_post %{name}.service %endif @@ -88,7 +87,7 @@ install -Dm 0644 %{SOURCE1} \ %endif %postun -%service_del_postun %{name}@.service %{name}-resume.service +%service_del_postun %{name}-resume.service %if 0%{?suse_version} > 1320 %systemd_user_postun %{name}.service %endif