From 2c45424ace072144210a2a59a2ac4b121d4ba8ed Mon Sep 17 00:00:00 2001 From: iznogood <> Date: Feb 22 2022 20:26:22 +0000 Subject: Update NetworkManager-iodine to version 1.2.0 / rev 7 via SR 956512 https://build.opensuse.org/request/show/956512 by user iznogood + dimstar_suse --- diff --git a/.files b/.files index 1efe973..156d814 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index a4c5bd8..2264df4 100644 --- a/.rev +++ b/.rev @@ -48,4 +48,12 @@ %_vpnservicedir (provided by macros.NetworkManager). (forwarded request 799452 from dimstar)</comment> <requestid>799489</requestid> </revision> + <revision rev="7" vrev="6"> + <srcmd5>4389f427ac9b146d602eb946717dd90e</srcmd5> + <version>1.2.0</version> + <time>1645561073</time> + <user>dimstar_suse</user> + <comment></comment> + <requestid>956512</requestid> + </revision> </revisionlist> diff --git a/NetworkManager-iodine.changes b/NetworkManager-iodine.changes index c0007f4..dabb1c3 100644 --- a/NetworkManager-iodine.changes +++ b/NetworkManager-iodine.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Feb 19 17:51:33 UTC 2022 - Callum Farmer <gmbr3@opensuse.org> + +- Create nm-iodine user (by systemd-sysusers) +- Update Supplements to new format + +------------------------------------------------------------------- Fri May 1 09:12:00 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org> - Set the path for the VPN service name file correctly to diff --git a/NetworkManager-iodine.spec b/NetworkManager-iodine.spec index c806167..c080f97 100644 --- a/NetworkManager-iodine.spec +++ b/NetworkManager-iodine.spec @@ -25,7 +25,9 @@ License: GPL-2.0-or-later Group: Productivity/Networking/System URL: https://honk.sigxcpu.org/piki/projects/network-manager-iodine/ Source0: http://download.gnome.org/sources/NetworkManager-iodine/1.2/%{name}-%{version}.tar.xz +Source1: system-user-nm-iodine.conf BuildRequires: intltool +BuildRequires: sysuser-tools BuildRequires: pkgconfig BuildRequires: pkgconfig(gtk+-3.0) >= 2.91.4 BuildRequires: pkgconfig(libnm) >= 1.1.0 @@ -33,7 +35,7 @@ BuildRequires: pkgconfig(libnma) >= 1.1.0 BuildRequires: pkgconfig(libsecret-1) Requires: NetworkManager >= 1.1.0 Requires: iodine >= 0.6.0rc1 -Supplements: packageand(NetworkManager:iodine) +Supplements: (NetworkManager and iodine) %description A network manager VPN plugin that allows you to tunnel your connection @@ -44,7 +46,7 @@ firewalled but DNS traffic is still allowed. Summary: NetworkManager VPN support for iodine Group: Productivity/Networking/System Requires: %{name} = %{version}-%{release} -Supplements: packageand(NetworkManager-gnome:iodine) +Supplements: (NetworkManager-gnome and iodine) %description gnome A network manager VPN plugin that allows you to tunnel your connection @@ -57,6 +59,7 @@ firewalled but DNS traffic is still allowed. %setup -q %build +%sysusers_generate_pre %{SOURCE1} %{name} %{name}.conf %configure \ --disable-static \ --disable-more-warnings \ @@ -66,12 +69,16 @@ make %{?_smp_mflags} %install %make_install +install -Dm0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/%{name}.conf %find_lang %{name} %{?no_lang_C} find %{buildroot} -type f -name "*.la" -delete -print +%pre -f %{name}.pre + %files %license COPYING %doc AUTHORS NEWS +%{_sysusersdir}/%{name}.conf %{_libdir}/NetworkManager/libnm-vpn-plugin-iodine.so %{_vpnservicedir}/nm-iodine-service.name %{_libexecdir}/nm-iodine-service diff --git a/system-user-nm-iodine.conf b/system-user-nm-iodine.conf new file mode 100644 index 0000000..be52c9e --- /dev/null +++ b/system-user-nm-iodine.conf @@ -0,0 +1,2 @@ +#Type Name ID GECOS Home directory Shell +u nm-iodine - "NetworkManager user for iodine" /var/lib/nm-iodine -