From 1a803c048d815a8cec54619fa4bde677e2b970901c8ef8c995427b3b6d56cf68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 20 Feb 2019 08:48:51 +0000 Subject: [PATCH] Accepting request 677477 from home:adkorte:branches:openSUSE:Factory - Fix references path below legacy directory /var/run -> /run - Run %tmpfiles_create macro in %post - Fix env-script-interpreter error OBS-URL: https://build.opensuse.org/request/show/677477 OBS-URL: https://build.opensuse.org/package/show/network/vpnc?expand=0&rev=87 --- vpnc.changes | 7 +++++++ vpnc.conf | 2 +- vpnc.spec | 11 +++++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/vpnc.changes b/vpnc.changes index 7384efc..22f334f 100644 --- a/vpnc.changes +++ b/vpnc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 19 21:08:21 UTC 2019 - suse+build@de-korte.org + +- Fix references path below legacy directory /var/run -> /run +- Run %tmpfiles_create macro in %post +- Fix env-script-interpreter error + ------------------------------------------------------------------- Wed Nov 12 13:52:59 UTC 2014 - idonmez@suse.com diff --git a/vpnc.conf b/vpnc.conf index 5507cd5..8274885 100644 --- a/vpnc.conf +++ b/vpnc.conf @@ -1 +1 @@ -d /var/run/vpnc 0755 root root +d /run/vpnc 0755 root root diff --git a/vpnc.spec b/vpnc.spec index 1eab3da..35c74e9 100644 --- a/vpnc.spec +++ b/vpnc.spec @@ -1,7 +1,7 @@ # # spec file for package vpnc # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -23,7 +23,7 @@ Name: vpnc Version: 0.5.3r550 Release: 0 Summary: A Client for Cisco VPN concentrator -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Networking/Security Url: http://svn.unix-ag.uni-kl.de/vpnc/branches/vpnc-nortel Source: %{name}-%{version}.tar.bz2 @@ -75,6 +75,7 @@ rm -rfv %{buildroot}%{_datadir}/doc/vpnc install -D -m 0644 $RPM_SOURCE_DIR/%{name}.service %{buildroot}/%{_unitdir}/%{name}@.service install -D -m 0644 $RPM_SOURCE_DIR/%{name}.conf %{buildroot}/%{_libexecdir}/tmpfiles.d/%{name}.conf %endif +sed -i -e '1c#!/usr/bin/perl' %{buildroot}%{_bindir}/pcf2vpnc %pre %if 0%{?suse_version} >= 1210 @@ -83,6 +84,7 @@ install -D -m 0644 $RPM_SOURCE_DIR/%{name}.conf %{buildroot}/%{_libexecdir}/tmpf %post %if 0%{?suse_version} >= 1210 +%tmpfiles_create %{_libexecdir}/tmpfiles.d/%{name}.conf %service_add_post %{name}@.service %endif @@ -114,6 +116,7 @@ install -D -m 0644 $RPM_SOURCE_DIR/%{name}.conf %{buildroot}/%{_libexecdir}/tmpf %{_unitdir}/%{name}@.service %{_libexecdir}/tmpfiles.d/%{name}.conf %endif -%doc ChangeLog COPYING README TODO VERSION +%doc ChangeLog README TODO VERSION +%license COPYING %changelog