From b54459f5c75efa2c652e4947bb1d2dea78a7b58f74b53ec9643dceac68d749d8 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 2 May 2018 06:47:54 +0000
Subject: [PATCH] - Put %fillup back into %post

OBS-URL: https://build.opensuse.org/package/show/server:http/varnish?expand=0&rev=86
---
 varnish.changes    | 5 +++++
 varnish.service    | 2 +-
 varnish.spec       | 7 ++++---
 varnishlog.service | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/varnish.changes b/varnish.changes
index b75c277..241d05f 100644
--- a/varnish.changes
+++ b/varnish.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May  2 06:47:32 UTC 2018 - jengelh@inai.de
+
+- Put %fillup back into %post
+
 -------------------------------------------------------------------
 Mon Mar 19 22:22:35 UTC 2018 - jengelh@inai.de
 
diff --git a/varnish.service b/varnish.service
index 29df45e..8a4938a 100644
--- a/varnish.service
+++ b/varnish.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 EnvironmentFile=/etc/sysconfig/varnish
 PIDFile=/var/run/varnishd.pid
-ExecStart=/usr/sbin/varnishd $VARNISHD_PARAMS -P /var/run/varnishd.pid -F
+ExecStart=/usr/sbin/varnishd -P /var/run/varnishd.pid -F $VARNISHD_PARAMS
 
 [Install]
 WantedBy=multi-user.target
diff --git a/varnish.spec b/varnish.spec
index f15596f..8f54e8c 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -120,7 +120,7 @@ install -dm 0755 "$b"/{%pkg_logdir,%pkg_home}
 install -Dpm 0644 "%{S:5}" "$b/%_sysconfdir/logrotate.d/varnish"
 #
 ##init scripts
-install -Dpm 0644 "%{S:3}" "$b%{_fillupdir}/sysconfig.%name"
+install -Dpm 0644 "%{S:3}" "$b/%_fillupdir/sysconfig.%name"
 install -Dpm 0644 "%{S:7}" "$b/%_unitdir/varnish.service"
 install -Dpm 0644 "%{S:8}" "$b/%_unitdir/varnishlog.service"
 mkdir -p "$b/%_sbindir"
@@ -155,6 +155,7 @@ fi
 %service_add_pre varnish.service varnishlog.service
 
 %post
+%fillup_only
 %service_add_post varnish.service varnishlog.service
 
 %preun
@@ -181,7 +182,7 @@ fi
 %dir %attr(0750,varnish,varnish) %pkg_home
 %dir %attr(0750,varnish,varnish) %pkg_cachedir
 %dir %attr(0750,varnish,varnish) %pkg_logdir
-%{_fillupdir}/sysconfig.%name
+%_fillupdir/sysconfig.%name
 
 %files -n %library_name
 %defattr(-,root,root,-)
@@ -189,7 +190,7 @@ fi
 
 %files devel
 %defattr(-,root,root,-)
-%_includedir/varnish
+%_includedir/varnish/
 %_datadir/aclocal/
 %_libdir/pkgconfig/*
 %_libdir/libvarnishapi.so
diff --git a/varnishlog.service b/varnishlog.service
index 6eb94f7..e7b236b 100644
--- a/varnishlog.service
+++ b/varnishlog.service
@@ -6,7 +6,7 @@ Requires=varnish.service
 [Service]
 EnvironmentFile=/etc/sysconfig/varnish
 PIDFile=/var/run/varnishlog.pid
-ExecStart=/usr/sbin/varnishncsa $VARNISHLOG_PARAMS -P /var/run/varnishlog.pid
+ExecStart=/usr/sbin/varnishncsa -P /var/run/varnishlog.pid $VARNISHLOG_PARAMS
 
 [Install]
 WantedBy=multi-user.target