diff --git a/cachefilesd.spec b/cachefilesd.spec index 7cc6dce..3afdeb2 100644 --- a/cachefilesd.spec +++ b/cachefilesd.spec @@ -12,6 +12,7 @@ BuildRequires: automake, autoconf Requires(post): /sbin/chkconfig, /sbin/service Requires(preun): /sbin/chkconfig, /sbin/service Requires: selinux-policy-base >= 3.7.19-5 +Conflicts: filesystem < 3 %description The cachefilesd daemon manages the caching files and directory that are @@ -30,17 +31,17 @@ PIE="-fpie" export PIE CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE`" -make all +make SBINDIR=%{_sbindir} all %install rm -rf %{buildroot} -mkdir -p %{buildroot}/sbin +mkdir -p %{buildroot}/%{_sbindir} mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d mkdir -p %{buildroot}%{_mandir}/{man5,man8} mkdir -p %{buildroot}/usr/share/doc/%{name}-%{version} mkdir -p %{buildroot}/usr/share/doc/%{name}-selinux-%{version} mkdir -p %{buildroot}%{_localstatedir}/cache/fscache -make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} SBINDIR=%{_sbindir} install install -m 644 cachefilesd.conf %{buildroot}%{_sysconfdir} install -m 755 cachefilesd.initd %{buildroot}%{_sysconfdir}/rc.d/init.d/cachefilesd @@ -78,7 +79,7 @@ fi %doc selinux/*.te %config(noreplace) %{_sysconfdir}/cachefilesd.conf %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/cachefilesd -/sbin/* +%{_sbindir}/* %{_mandir}/*/* %{_localstatedir}/cache/fscache