Accepting request 456145 from home:kukuk:branches:security:Stunnel

- Don't require insserv if we don't use it

OBS-URL: https://build.opensuse.org/request/show/456145
OBS-URL: https://build.opensuse.org/package/show/security:Stunnel/stunnel?expand=0&rev=86
This commit is contained in:
Andreas Vetter 2017-02-10 22:14:21 +00:00 committed by Git OBS Bridge
parent 862cd0f3bb
commit 812af2d590
2 changed files with 14 additions and 5 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Feb 10 21:58:34 UTC 2017 - kukuk@suse.de
- Don't require insserv if we don't use it
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jan 28 12:05:03 UTC 2017 - michael@stroeder.com Sat Jan 28 12:05:03 UTC 2017 - michael@stroeder.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package stunnel # spec file for package stunnel
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
Name: stunnel Name: stunnel
Version: 5.40 Version: 5.40
Release: 0 Release: 0
@ -22,7 +23,7 @@ Summary: Universal SSL Tunnel
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Networking/Security Group: Productivity/Networking/Security
Url: http://www.stunnel.org/ Url: http://www.stunnel.org/
PreReq: /usr/sbin/useradd fileutils textutils %insserv_prereq %fillup_prereq PreReq: /usr/sbin/useradd fileutils textutils %fillup_prereq
Source: ftp://ftp.stunnel.org/stunnel/%{name}-%{version}.tar.gz Source: ftp://ftp.stunnel.org/stunnel/%{name}-%{version}.tar.gz
Source1: stunnel.conf Source1: stunnel.conf
Source2: stunnel.README Source2: stunnel.README
@ -32,13 +33,16 @@ Source5: stunnel.service
Patch0: stunnel-listenqueue-option.patch Patch0: stunnel-listenqueue-option.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define VENDOR openSUSE %define VENDOR openSUSE
BuildRequires: tcpd-devel zlib-devel
BuildRequires: libopenssl-devel BuildRequires: libopenssl-devel
BuildRequires: tcpd-devel
BuildRequires: zlib-devel
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
BuildRequires: systemd BuildRequires: systemd
%{?systemd_requires} %{?systemd_requires}
%define has_systemd 1 %define has_systemd 1
%else
PreReq: %insserv_prereq
%endif %endif
%description %description
@ -128,8 +132,6 @@ if ! test -f etc/stunnel/stunnel.pem; then
fi fi
fi fi
%preun %preun
%if 0%{?has_systemd} %if 0%{?has_systemd}
%service_del_preun %{name}.service %service_del_preun %{name}.service
@ -179,3 +181,5 @@ fi
%doc doc/stunnel.*.html %doc doc/stunnel.*.html
%doc doc/en/* %doc doc/en/*
%doc doc/pl %doc doc/pl
%changelog