From 795e78839f3e8ee48866eb48ea808a9c38d46e1e Mon Sep 17 00:00:00 2001
From: Vitezslav Crhonek <vcrhonek@redhat.com>
Date: Thu, 24 Mar 2011 13:30:51 +0100
Subject: [PATCH] Use %%ghost for /var/run/gather

---
 sblim-gather.spec     | 43 +++++++++++++++++++++++++++++++------------
 sblim-gather.tmpfiles |  1 +
 2 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 sblim-gather.tmpfiles

diff --git a/sblim-gather.spec b/sblim-gather.spec
index f159e66..df49899 100644
--- a/sblim-gather.spec
+++ b/sblim-gather.spec
@@ -1,10 +1,10 @@
-%define sblim_testsuite_version 1.2.4
-%define provider_dir %{_libdir}/cmpi
-%define tog_pegasus_version 2:2.6.1-1
+%global sblim_testsuite_version 1.2.4
+%global provider_dir %{_libdir}/cmpi
+%global tog_pegasus_version 2:2.6.1-1
 
 Name:           sblim-gather
 Version:        2.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        SBLIM Gatherer
 
 Group:          Applications/System
@@ -13,14 +13,15 @@ URL:            http://sourceforge.net/projects/sblim/
 Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2
 Source1:        gather-config.h.prepend
 Source2:        gather-config.h
+Source3:        sblim-gather.tmpfiles
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: sblim-cmpi-devel
-BuildRequires: sblim-cmpi-base-devel
-BuildRequires: tog-pegasus-devel >= %{tog_pegasus_version}
-BuildRequires: libsysfs-devel
-BuildRequires: libvirt-devel
-Requires:      tog-pegasus >= %{tog_pegasus_version}
+BuildRequires:  sblim-cmpi-devel
+BuildRequires:  sblim-cmpi-base-devel
+BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
+BuildRequires:  libsysfs-devel
+BuildRequires:  libvirt-devel
+Requires:       tog-pegasus >= %{tog_pegasus_version}
 
 %description
 Standards Based Linux Instrumentation for Manageability
@@ -97,6 +98,10 @@ cat %{SOURCE1} \
 chmod 644 $RPM_BUILD_ROOT/%{_includedir}/gather/gather-config.h
 install -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_includedir}/gather/
 
+%if %{?fedora}0 > 140 || %{?rhel}0 > 60
+    install -p -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/sblim-gather.conf
+%endif
+
 # shared libraries
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
 echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
@@ -113,7 +118,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %{_sbindir}/*
 %{_datadir}/doc/%{name}-%{version}
-%{_localstatedir}/run/gather
+%if %{?fedora}0 > 140 || %{?rhel}0 > 60
+    %config(noreplace) %{_sysconfdir}/tmpfiles.d/sblim-gather.conf
+%endif
+%ghost /var/run/gather
 %{_libdir}/lib[^O]*.so.*
 %dir %{_libdir}/gather
 %{_libdir}/gather/mplug
@@ -141,7 +149,14 @@ rm -rf $RPM_BUILD_ROOT
 %define GATHER_SCHEMA %{_datadir}/%{name}/Linux_Metric.mof %{_datadir}/%{name}/Linux_IPProtocolEndpointMetric.mof %{_datadir}/%{name}/Linux_LocalFileSystemMetric.mof %{_datadir}/${name}/Linux_NetworkPortMetric.mof %{_datadir}/%{name}/Linux_OperatingSystemMetric.mof %{_datadir}/%{name}/Linux_ProcessorMetric.mof %{_datadir}/%{name}/Linux_UnixProcessMetric.mof %{_datadir}/%{name}/Linux_XenMetric.mof %{_datadir}/%{name}/Linux_zECKDMetric.mof %{_datadir}/%{name}/Linux_zCECMetric.mof %{_datadir}/%{name}/Linux_zLPARMetric.mof %{_datadir}/%{name}/Linux_zCHMetric.mof
 %define GATHER_REGISTRATION %{_datadir}/%{name}/Linux_IPProtocolEndpointMetric.registration %{_datadir}/%{name}/Linux_LocalFileSystemMetric.registration %{_datadir}/%{name}/Linux_Metric.registration %{_datadir}/%{name}/Linux_NetworkPortMetric.registration %{_datadir}/%{name}/Linux_OperatingSystemMetric.registration %{_datadir}/%{name}/Linux_ProcessorMetric.registration %{_datadir}/%{name}/Linux_UnixProcessMetric.registration %{_datadir}/%{name}/Linux_XenMetric.registration %{_datadir}/%{name}/Linux_zECKDMetric.registration %{_datadir}/%{name}/Linux_zCECMetric.registration %{_datadir}/%{name}/Linux_zLPARMetric.registration %{_datadir}/%{name}/Linux_zCHMetric.registration
 
-%post -p /sbin/ldconfig
+%post
+install -d -m 0755 -o root -g root /var/run/gather
+/sbin/ldconfig
+
+%preun
+if [ $1 -eq 0 ]; then
+  rm -rf /var/run/gather
+fi
 
 %postun -p /sbin/ldconfig
 
@@ -174,6 +189,10 @@ fi
 %postun provider -p /sbin/ldconfig
 
 %changelog
+* Thu Mar 24 2011 Vitezlsav Crhonek <vcrhonek@redhat.com> - 2.2.2-3
+- Use %%ghost for /var/run/gather
+  Resolves: #656686
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sblim-gather.tmpfiles b/sblim-gather.tmpfiles
new file mode 100644
index 0000000..e413792
--- /dev/null
+++ b/sblim-gather.tmpfiles
@@ -0,0 +1 @@
+d /var/run/gather 0755 root root -