forked from pool/stunnel
Accepting request 544840 from home:RBrownSUSE:branches:security:Stunnel
Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544840 OBS-URL: https://build.opensuse.org/package/show/security:Stunnel/stunnel?expand=0&rev=95
This commit is contained in:
parent
41c7083de5
commit
513073a1bd
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 23 13:54:29 UTC 2017 - rbrown@suse.com
|
||||
|
||||
- Replace references to /var/adm/fillup-templates with new
|
||||
%_fillupdir macro (boo#1069468)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 17 12:23:45 UTC 2017 - vetter@physik.uni-wuerzburg.de
|
||||
|
||||
|
11
stunnel.spec
11
stunnel.spec
@ -16,6 +16,11 @@
|
||||
#
|
||||
|
||||
|
||||
#Compat macro for new _fillupdir macro introduced in Nov 2017
|
||||
%if ! %{defined _fillupdir}
|
||||
%define _fillupdir /var/adm/fillup-templates
|
||||
%endif
|
||||
|
||||
Name: stunnel
|
||||
Version: 5.42
|
||||
Release: 0
|
||||
@ -89,8 +94,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
cp -p %{S:1} tools/stunnel.conf-sample.%VENDOR
|
||||
cp -p %{S:2} README.%VENDOR
|
||||
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
|
||||
cp -p %{S:3} $RPM_BUILD_ROOT/var/adm/fillup-templates/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_fillupdir}
|
||||
cp -p %{S:3} $RPM_BUILD_ROOT%{_fillupdir}/
|
||||
%if 0%{?has_systemd}
|
||||
install -D -m 0644 $RPM_SOURCE_DIR/stunnel.service $RPM_BUILD_ROOT/%_unitdir/stunnel.service
|
||||
ln -s service $RPM_BUILD_ROOT/usr/sbin/rcstunnel
|
||||
@ -170,7 +175,7 @@ fi
|
||||
%dir %attr(755,root,root) /var/lib/stunnel/sbin
|
||||
%dir %attr(755,root,root) /var/lib/stunnel/var
|
||||
%dir %attr(755,stunnel,root) /var/lib/stunnel/var/run
|
||||
/var/adm/fillup-templates/sysconfig.syslog-stunnel
|
||||
%{_fillupdir}/sysconfig.syslog-stunnel
|
||||
%if 0%{?has_systemd}
|
||||
%_unitdir/stunnel.service
|
||||
%else
|
||||
|
Loading…
x
Reference in New Issue
Block a user