From 8c9bce2fb6f4474c4288671788472f8aaaf6e779340c499a973a1ce6af78f74f Mon Sep 17 00:00:00 2001
From: Malcolm Lewis <malcolmlewis@linuxmail.org>
Date: Mon, 21 Jun 2021 13:10:11 +0000
Subject: [PATCH] Accepting request 898510 from
 home:jengelh:branches:network:utilities

- Use noun phrasing in descriptions.
- Use more modern rpm macros.
- Reduce sh code emissions of %service_*.

OBS-URL: https://build.opensuse.org/request/show/898510
OBS-URL: https://build.opensuse.org/package/show/network:utilities/iodine?expand=0&rev=20
---
 iodine.changes |  7 +++++++
 iodine.spec    | 37 ++++++++++++++++---------------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/iodine.changes b/iodine.changes
index 70ddc5d..f2e8b97 100644
--- a/iodine.changes
+++ b/iodine.changes
@@ -3,6 +3,13 @@ Sun Jun 13 13:35:10 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
 
 - Add now working CONFIG parameter to sysusers generator
 
+-------------------------------------------------------------------
+Tue Jun  8 15:48:30 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
+
+- Use noun phrasing in descriptions.
+- Use more modern rpm macros.
+- Reduce sh code emissions of %service_*.
+
 -------------------------------------------------------------------
 Sat Jun  5 12:33:09 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
 
diff --git a/iodine.spec b/iodine.spec
index b3669ba..03dd6b4 100644
--- a/iodine.spec
+++ b/iodine.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package iodine
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 # Copyright (c) 2012 Malcolm J Lewis <malcolmlewis@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -13,7 +13,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/
 #
 
 
@@ -25,10 +25,10 @@
 Name:           iodine
 Version:        0.7.0
 Release:        0
-Summary:        Tunnel IPv4 data through a DNS server
+Summary:        IPv4-through-DNS tunnel server and client
 License:        ISC
 Group:          Productivity/Networking/System
-Url:            http://code.kryo.se/iodine/
+URL:            http://code.kryo.se/iodine/
 Source0:        http://code.kryo.se/iodine/iodine-%{version}.tar.gz
 Source1:        iodine.service
 Source2:        sysconfig.iodine
@@ -38,8 +38,8 @@ Source5:        system-user-iodined.conf
 #PATCH-FIX-OPENSUSE iodine-fix-makefile-prefix.patch malcolmlewis@opensuse.org -- Modify default install prefix.
 Patch0:         iodine-fix-makefile-prefix.patch
 BuildRequires:  fdupes
-BuildRequires:  pkgconfig(systemd)
 BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(systemd)
 # iodine still uses ifconfig
 Requires:       net-tools-deprecated
 Requires(pre):  %fillup_prereq
@@ -54,22 +54,21 @@ Requires(pre):  /usr/sbin/useradd
 %endif
 
 %description
-Lets you tunnel IPv4 data through a DNS server. This can be usable
-in different situations where internet access is firewalled, but DNS
-queries are allowed.
+This software lets one tunnel IPv4 data through a DNS server. This
+can be usable in different situations where internet access is
+firewalled, but DNS queries are allowed.
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1
+%autosetup -p1
 
 %build
-make PREFIX=%{_prefix} %{?_smp_mflags}
+make PREFIX="%{_prefix}"
 %if 0%{?suse_version} >= 1550
 %sysusers_generate_pre %{SOURCE5} iodine system-user-iodined.conf
 %endif
 
 %install
-make install PREFIX=%{buildroot}%{_prefix}
+make install PREFIX="%{buildroot}/%{_prefix}"
 # Install client files
 mkdir -p %{buildroot}%{_unitdir}
 install -m 0644 %{S:1} %{buildroot}%{_unitdir}/
@@ -95,28 +94,24 @@ install -m 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/
 %if 0%{?suse_version} >= 1550
 %pre -f iodine.pre
 %else
+
 %pre
 /usr/sbin/useradd -r -d /var/lib/iodined -s /bin/false -c "user for iodine dns tunnel" -g nobody iodined 2> /dev/null || :
 %endif
-%service_add_pre iodine.service
-%service_add_pre iodined.service
+%service_add_pre iodine.service iodined.service
 
 %post
-%service_add_post iodine.service
-%service_add_post iodined.service
+%service_add_post iodine.service iodined.service
 %{fillup_only -n iodine}
 %{fillup_only -n iodined}
 
 %preun
-%service_del_preun iodine.service
-%service_del_preun iodined.service
+%service_del_preun iodine.service iodined.service
 
 %postun
-%service_del_postun iodine.service
-%service_del_postun iodined.service
+%service_del_postun iodine.service iodined.service
 
 %files
-%defattr(-,root,root)
 %doc CHANGELOG README TODO
 %{_sbindir}/%{name}
 %{_sbindir}/%{name}d