From 33fbffc3dd6abedc6600caa3518d7288f75a0869 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Thu, 28 Nov 2013 14:41:14 +0100 Subject: [PATCH] revert previous change and use %tmpfiles_create in %post --- lockdev.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/lockdev.spec b/lockdev.spec index 909fae3..d12e55e 100644 --- a/lockdev.spec +++ b/lockdev.spec @@ -10,7 +10,7 @@ Summary: A library for locking devices Name: lockdev Version: 1.0.4 -Release: 0.12.%{checkout}%{?dist} +Release: 0.13.%{checkout}%{?dist} License: LGPLv2 Group: System Environment/Libraries URL: https://alioth.debian.org/projects/lockdev/ @@ -24,7 +24,7 @@ Patch1: lockdev-euidaccess.patch Requires(pre): shadow-utils Requires(post): glibc Requires(postun): glibc -Requires: systemd-units >= 13 +Requires: systemd BuildRequires: autoconf BuildRequires: automake @@ -73,6 +73,7 @@ make install DESTDIR=%{buildroot} rm -f %{buildroot}%{_libdir}/*.la +# %%ghosted, but needs to be in buildroot # on reboot re-created by %%{_prefix}/lib/tmpfiles.d/legacy.conf mkdir -p %{buildroot}%{_lockdir} @@ -81,12 +82,19 @@ getent group lock >/dev/null 2>&1 || groupadd -g 54 -r -f lock >/dev/null 2>&1 | %post -p /sbin/ldconfig +%post +/sbin/ldconfig +if [ $1 -eq 1 ] ; then + # for the time until first reboot + %tmpfiles_create +fi + %postun -p /sbin/ldconfig %files %doc COPYING AUTHORS -%dir %attr(0775,root,lock) %{_lockdir} +%ghost %dir %attr(0775,root,lock) %{_lockdir} %attr(2711,root,lock) %{_sbindir}/lockdev %{_libdir}/*.so.* %{_mandir}/man8/* @@ -98,6 +106,9 @@ getent group lock >/dev/null 2>&1 || groupadd -g 54 -r -f lock >/dev/null 2>&1 | %{_includedir}/* %changelog +* Thu Nov 28 2013 Jiri Popelka - 1.0.4-0.13.20111007git +- revert previous change and use %%tmpfiles_create in %%post + * Wed Nov 27 2013 Jiri Popelka - 1.0.4-0.12.20111007git - do not %%ghost /var/lock/lockdev (https://fedorahosted.org/fesco/ticket/525)