jengelh/varnish
SHA256
1
0
Fork 0
forked from pool/varnish
Code Pull Requests Activity

Accepting request 544794 from home:RBrownSUSE:branches:server:http

Browse Source 
Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/544794
OBS-URL: https://build.opensuse.org/package/show/server:http/varnish?expand=0&rev=83
This commit is contained in:
Jan Engelhardt 2017-11-23 20:44:14 +00:00 committed by Git OBS Bridge
parent 690a94e102
commit 26eb87f18d
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
varnish.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:50:41 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 23 19:42:07 UTC 2017 - antoine.belvire@opensuse.org Fri Jun 23 19:42:07 UTC 2017 - antoine.belvire@opensuse.org

9
varnish.spec
View File

@ -16,6 +16,11 @@
# #
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%define library_name libvarnishapi1 %define library_name libvarnishapi1
%define pkg_home %_localstatedir/lib/%name %define pkg_home %_localstatedir/lib/%name
%define pkg_logdir %_localstatedir/log/%name %define pkg_logdir %_localstatedir/log/%name
@ -120,7 +125,7 @@ install -dm 0755 "$b"/{%pkg_logdir,%pkg_home};
install -Dpm 0644 "%{S:5}" "$b/%_sysconfdir/logrotate.d/varnish"; install -Dpm 0644 "%{S:5}" "$b/%_sysconfdir/logrotate.d/varnish";
# #
##init scripts ##init scripts
install -Dpm 0644 "%{S:3}" "$b%_localstatedir/adm/fillup-templates/sysconfig.%name"; install -Dpm 0644 "%{S:3}" "$b%{_fillupdir}/sysconfig.%name";
install -Dpm 0644 "%{S:7}" "$b/%_unitdir/varnish.service"; install -Dpm 0644 "%{S:7}" "$b/%_unitdir/varnish.service";
install -Dpm 0644 "%{S:8}" "$b/%_unitdir/varnishlog.service"; install -Dpm 0644 "%{S:8}" "$b/%_unitdir/varnishlog.service";
mkdir -p "$b/%_sbindir"; mkdir -p "$b/%_sbindir";
@ -182,7 +187,7 @@ fi
%dir %attr(0750,varnish,varnish) %pkg_home %dir %attr(0750,varnish,varnish) %pkg_home
%dir %attr(0750,varnish,varnish) %pkg_cachedir %dir %attr(0750,varnish,varnish) %pkg_cachedir
%dir %attr(0750,varnish,varnish) %pkg_logdir %dir %attr(0750,varnish,varnish) %pkg_logdir
%_localstatedir/adm/fillup-templates/sysconfig.%name %{_fillupdir}/sysconfig.%name
%files -n %library_name %files -n %library_name
%defattr(-,root,root,-) %defattr(-,root,root,-)