Accepting request 573322 from home:asvetter:branches:security:Stunnel

- Revamp SLE11 builds

OBS-URL: https://build.opensuse.org/request/show/573322
OBS-URL: https://build.opensuse.org/package/show/security:Stunnel/stunnel?expand=0&rev=101
This commit is contained in:
Andreas Vetter 2018-02-07 09:38:42 +00:00 committed by Git OBS Bridge
parent a869942b32
commit cdf38be57a
2 changed files with 31 additions and 13 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 6 13:51:49 UTC 2018 - vetter@physik.uni-wuerzburg.de
- Revamp SLE11 builds
-------------------------------------------------------------------
Thu Feb 1 23:07:21 UTC 2018 - jengelh@inai.de

View File

@ -16,14 +16,23 @@
#
%define VENDOR openSUSE
%define VENDORAFFIX openSUSE
%if 0%{?suse_version} >= 1210
%define has_systemd 1
BuildRequires: systemd
%{?systemd_requires}
%else
PreReq: %insserv_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(pre): %insserv_prereq
Requires(pre): /usr/sbin/useradd
# %{_sbindir} does not work here!
%endif
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir %{_localstatedir}/adm/fillup-templates
@ -45,14 +54,12 @@ Source6: stunnel.conf
Source7: stunnel.README
Patch0: stunnel-listenqueue-option.patch
BuildRequires: libopenssl-devel
BuildRequires: pkgconfig
BuildRequires: tcpd-devel
BuildRequires: zlib-devel
BuildRequires: pkgconfig(libsystemd)
PreReq: %fillup_prereq
PreReq: %{_sbindir}/useradd
PreReq: fileutils
PreReq: textutils
Requires(pre): %fillup_prereq
Requires(pre): %{_sbindir}/useradd
Requires(pre): fileutils
Requires(pre): textutils
%if 0%{?suse_version} >= 1500
Requires(pre): group(nogroup)
%endif
@ -97,10 +104,14 @@ make %{?_smp_mflags} LDADD="-pie -Wl,-z,defs,-z,relro"
make %{?_smp_mflags} check
%install
%make_install
%if 0%{?suse_version} >= 1210
%make_install
%else
make install DESTDIR=$RPM_BUILD_ROOT
%endif
cp -p %{SOURCE1} tools/stunnel.conf-sample.%{VENDOR}
cp -p %{SOURCE2} README.%{VENDOR}
cp -p %{SOURCE1} tools/stunnel.conf-sample.%{VENDORAFFIX}
cp -p %{SOURCE2} README.%{VENDORAFFIX}
mkdir -p %{buildroot}%{_fillupdir}
cp -p %{SOURCE3} %{buildroot}%{_fillupdir}/
%if 0%{?has_systemd}
@ -143,7 +154,7 @@ if ! test -s etc/stunnel/stunnel.conf; then
fi
# first installation?
if [ ${FIRST_ARG:-0} = 1 ] && [ ! -f etc/stunnel/stunnel.pem ]; then
cat usr/share/doc/packages/stunnel/README.%{VENDOR}
cat usr/share/doc/packages/stunnel/README.%{VENDORAFFIX}
fi
%preun
@ -162,8 +173,9 @@ fi
%endif
%files
%defattr(-,root,root)
%doc COPYING COPYRIGHT.GPL CREDITS
%doc README.%{VENDOR}
%doc README.%{VENDORAFFIX}
%doc tools/ca.*
%doc tools/importCA.*
%doc tools/stunnel.conf-sample
@ -187,6 +199,7 @@ fi
%endif
%files doc
%defattr(-,root,root)
%doc AUTHORS BUGS COPYING COPYRIGHT.GPL CREDITS ChangeLog NEWS PORTS
%doc README TODO
%doc doc/stunnel.html