From 79a051bc220d3843e484c33372f6cc5f29ec556d28a1bf0909c3960eaa425f6d Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 14 Jan 2022 12:38:07 +0000 Subject: [PATCH 1/3] Accepting request 946279 from home:olh:branches:network - remove instance units from post scripts, they can not be reloaded OBS-URL: https://build.opensuse.org/request/show/946279 OBS-URL: https://build.opensuse.org/package/show/network/vpnc?expand=0&rev=91 --- vpnc.changes | 5 +++++ vpnc.spec | 14 ++------------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/vpnc.changes b/vpnc.changes index dd217a7..8061ee0 100644 --- a/vpnc.changes +++ b/vpnc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 10 16:16:16 UTC 2022 - olaf@aepfle.de + +- remove instance units from post scripts, they can not be reloaded + ------------------------------------------------------------------- Thu May 7 08:34:48 UTC 2020 - pgajdos@suse.com diff --git a/vpnc.spec b/vpnc.spec index c62a40a..076f621 100644 --- a/vpnc.spec +++ b/vpnc.spec @@ -77,25 +77,15 @@ install -D -m 0644 $RPM_SOURCE_DIR/%{name}.conf %{buildroot}/%{_tmpfilesdir}/%{n %endif sed -i -e '1c#!/usr/bin/perl' %{buildroot}%{_bindir}/pcf2vpnc -%pre -%if 0%{?suse_version} >= 1210 -%service_add_pre %{name}@.service -%endif - %post %if 0%{?suse_version} >= 1210 %tmpfiles_create %{_tmpfilesdir}/%{name}.conf -%service_add_post %{name}@.service -%endif - -%preun -%if 0%{?suse_version} >= 1210 -%service_del_preun %{name}@.service +%service_add_post %endif %postun %if 0%{?suse_version} >= 1210 -%service_del_postun %{name}@.service +%service_del_postun %endif %files From 9bf9fba4b97f88b2275b638d60d91495c6db243212ffa37263e0ce7d2627252b Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 15 Jan 2022 13:03:17 +0000 Subject: [PATCH 2/3] Accepting request 946519 from home:olh:branches:network undo previous change, bug is in systemd-rpm-macros OBS-URL: https://build.opensuse.org/request/show/946519 OBS-URL: https://build.opensuse.org/package/show/network/vpnc?expand=0&rev=92 --- vpnc.changes | 5 ----- vpnc.spec | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/vpnc.changes b/vpnc.changes index 8061ee0..dd217a7 100644 --- a/vpnc.changes +++ b/vpnc.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Jan 10 16:16:16 UTC 2022 - olaf@aepfle.de - -- remove instance units from post scripts, they can not be reloaded - ------------------------------------------------------------------- Thu May 7 08:34:48 UTC 2020 - pgajdos@suse.com diff --git a/vpnc.spec b/vpnc.spec index 076f621..c62a40a 100644 --- a/vpnc.spec +++ b/vpnc.spec @@ -77,15 +77,25 @@ install -D -m 0644 $RPM_SOURCE_DIR/%{name}.conf %{buildroot}/%{_tmpfilesdir}/%{n %endif sed -i -e '1c#!/usr/bin/perl' %{buildroot}%{_bindir}/pcf2vpnc +%pre +%if 0%{?suse_version} >= 1210 +%service_add_pre %{name}@.service +%endif + %post %if 0%{?suse_version} >= 1210 %tmpfiles_create %{_tmpfilesdir}/%{name}.conf -%service_add_post +%service_add_post %{name}@.service +%endif + +%preun +%if 0%{?suse_version} >= 1210 +%service_del_preun %{name}@.service %endif %postun %if 0%{?suse_version} >= 1210 -%service_del_postun +%service_del_postun %{name}@.service %endif %files From 05223e494ee3b5ccf807b7496e2b2fe00d097977b47a3c95c1597b69997e480d Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 20 Feb 2024 13:47:15 +0000 Subject: [PATCH 3/3] Accepting request 1148026 from home:dimstar:rpm4.20:v Prepare for RPM 4.20 OBS-URL: https://build.opensuse.org/request/show/1148026 OBS-URL: https://build.opensuse.org/package/show/network/vpnc?expand=0&rev=93 --- vpnc.changes | 6 ++++++ vpnc.spec | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/vpnc.changes b/vpnc.changes index dd217a7..448c973 100644 --- a/vpnc.changes +++ b/vpnc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 20 13:29:43 UTC 2024 - Dominique Leuenberger + +- Use %autosetup macro. Allows to eliminate the usage of deprecated + %patchN + ------------------------------------------------------------------- Thu May 7 08:34:48 UTC 2020 - pgajdos@suse.com diff --git a/vpnc.spec b/vpnc.spec index c62a40a..d609c4e 100644 --- a/vpnc.spec +++ b/vpnc.spec @@ -58,8 +58,7 @@ aes192 aes256 Perfect Forward Secrecy: nopfs dh1 dh2 dh5 It runs entirely in userspace and uses the TUN/TAP driver for access. %prep -%setup -q -n %{name} -%patch1 -p1 +%autosetup -p1 -n %{name} %build export CFLAGS="%{optflags}"