From 41bfcdbe68f3f9269c404042e06ed003e46ee44fe2587f9d86e17b44f9fc101e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 16 Feb 2016 12:40:47 +0000 Subject: [PATCH] undo some more spec-cleaner changes OBS-URL: https://build.opensuse.org/package/show/server:http/varnish?expand=0&rev=73 --- varnish.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/varnish.spec b/varnish.spec index 5994cbc..8180587 100644 --- a/varnish.spec +++ b/varnish.spec @@ -98,7 +98,7 @@ This package holds the development files for varnish. %build export CFLAGS="%optflags -fstack-protector" %configure --disable-static --docdir="%_docdir/%name" \ - --localstatedir=%_localstatedir/cache/ \ + --localstatedir="%_localstatedir/cache/" \ --enable-developer-warnings make %{?_smp_mflags} @@ -110,12 +110,12 @@ mv "$b/%_bindir"/* "$b/%_sbindir/"; # ##missing directories install -dm 0755 "$b"/{%pkg_logdir,%pkg_home}; -install -Dpm 0644 "%SOURCE5" "$b/%_sysconfdir/logrotate.d/varnish"; +install -Dpm 0644 "%{S:5}" "$b/%_sysconfdir/logrotate.d/varnish"; # ##init scripts -install -Dpm 0644 "%SOURCE3" "$b%_localstatedir/adm/fillup-templates/sysconfig.%name"; -install -Dpm 0644 "%SOURCE7" "$b/%_unitdir/varnish.service"; -install -Dpm 0644 "%SOURCE8" "$b/%_unitdir/varnishlog.service"; +install -Dpm 0644 "%{S:3}" "$b%_localstatedir/adm/fillup-templates/sysconfig.%name"; +install -Dpm 0644 "%{S:7}" "$b/%_unitdir/varnish.service"; +install -Dpm 0644 "%{S:8}" "$b/%_unitdir/varnishlog.service"; mkdir -p "$b/%_sbindir"; ln -s service "$b/%_sbindir/rcvarnish"; ln -s service "$b/%_sbindir/rcvarnishlog"; @@ -124,7 +124,7 @@ ln -s service "$b/%_sbindir/rcvarnishlog"; mkdir -p "$b/%_sysconfdir/%name" cp "$b/%_docdir/%name/example.vcl" "$b/%_sysconfdir/%name/vcl.conf" -find %buildroot -type f -name "*.la" -delete -print +find "$b" -type f -name "*.la" -delete -print mkdir -p "$b/%pkg_logdir" mkdir -p "$b/%_docdir/%name" cp -a ChangeLog LICENSE README "$b/%_docdir/%name/" @@ -152,6 +152,7 @@ cp -a ChangeLog LICENSE README "$b/%_docdir/%name/" %post -n %library_name -p /sbin/ldconfig %postun -n %library_name -p /sbin/ldconfig + %files %defattr(-,root,root) %_unitdir/*.service