SHA256
1
0
forked from pool/iodine

Accepting request 478911 from home:malcolmlewis:branches:network:utilities

Fix building for Factory

OBS-URL: https://build.opensuse.org/request/show/478911
OBS-URL: https://build.opensuse.org/package/show/network:utilities/iodine?expand=0&rev=9
This commit is contained in:
OBS User mrdocs 2017-03-13 02:59:15 +00:00 committed by Git OBS Bridge
parent 7232f4528d
commit 1a3c53264f
2 changed files with 16 additions and 5 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 13 00:54:38 UTC 2017 - malcolmlewis@opensuse.org
- Remove insserv requirement and macro to fix Factory build.
- Add fdupes check to avoid duplicate man page warning.
-------------------------------------------------------------------
Wed Dec 28 13:14:22 UTC 2016 - wagner-thomas@gmx.at
- fixed unbalanced quotes in service files bnc#1017236

View File

@ -1,7 +1,7 @@
#
# spec file for package iodine
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2012 Malcolm J Lewis <malcolmlewis@opensuse.org>
#
# All modifications and additions to the file contributed by third parties
@ -16,13 +16,14 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: iodine
Version: 0.7.0
Release: 0
License: ISC
Summary: Tunnel IPv4 data through a DNS server
Url: http://code.kryo.se/iodine/
License: ISC
Group: Productivity/Networking/System
Url: http://code.kryo.se/iodine/
Source0: http://code.kryo.se/iodine/iodine-%{version}.tar.gz
Source1: iodine.service
Source2: sysconfig.iodine
@ -30,6 +31,7 @@ Source3: iodined.service
Source4: sysconfig.iodined
#PATCH-FIX-OPENSUSE iodine-fix-makefile-prefix.patch malcolmlewis@opensuse.org -- Modify default install prefix.
Patch0: iodine-fix-makefile-prefix.patch
BuildRequires: fdupes
BuildRequires: systemd
BuildRequires: zlib-devel
Requires(pre): %fillup_prereq
@ -64,13 +66,15 @@ cp %{name}.8 %{name}d.8
popd
# make chroot dir
mkdir -p %{buildroot}/var/lib/iodined
# make rc-link
ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rciodine
ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rciodined
%pre
%service_add_pre iodine.service
%service_add_pre iodined.service
/usr/sbin/useradd -r -d /var/lib/iodined -s /bin/false -c "user for iodine dns tunnel" -g nobody iodined 2> /dev/null || :
%post
%service_add_post iodine.service
%service_add_post iodined.service
@ -84,7 +88,6 @@ mkdir -p %{buildroot}/var/lib/iodined
%postun
%service_del_postun iodine.service
%service_del_postun iodined.service
%insserv_cleanup
%files
%defattr(-,root,root)
@ -93,6 +96,8 @@ mkdir -p %{buildroot}/var/lib/iodined
%{_sbindir}/%{name}d
%{_localstatedir}/adm/fillup-templates/sysconfig.iodine
%{_localstatedir}/adm/fillup-templates/sysconfig.iodined
%{_sbindir}/rciodine
%{_sbindir}/rciodined
%{_unitdir}/iodine.service
%{_unitdir}/iodined.service
%{_mandir}/man8/%{name}.8%{?ext_man}