diff options
| author | David Howells <dhowells@redhat.com> | 2014-02-25 18:35:33 +0000 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2014-02-25 18:35:33 +0000 |
| commit | 7e22a95f98aa9290b944e3590a3f1897aa7f75ac (patch) | |
| tree | 29986f18e790b07fd29e74199f883f605825097f | |
| parent | 10e7d5c3508584953167a350e4e469c357dafe4b (diff) | |
| download | cachefilesd-7e22a95f98aa9290b944e3590a3f1897aa7f75ac.tar.gz | |
Fix specfile errors
Fix specfile errors found by rpmlint including:
(1) Bad dates in the changelog.
(2) An uninstalled file.
Signed-off-by: David Howells <dhowells@redhat.com>
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | redhat/cachefilesd.spec | 29 |
2 files changed, 23 insertions, 13 deletions
@@ -4,6 +4,7 @@ DESTDIR := ETCDIR := /etc BINDIR := /bin SBINDIR := /sbin +MANDIR := /usr/share/man SPECFILE := redhat/cachefilesd.spec LNS := ln -sf @@ -46,11 +47,11 @@ cachefilesd: cachefilesd.c Makefile # Install everything # ############################################################################### -MAN5 := $(DESTDIR)/usr/share/man/man5 -MAN8 := $(DESTDIR)/usr/share/man/man8 +MAN5 := $(DESTDIR)$(MANDIR)/man5 +MAN8 := $(DESTDIR)$(MANDIR)/man8 install: all - $(INSTALL) -D cachefilesd $(DESTDIR)$(SBINDIR)/cachefilesd + $(INSTALL) -D -m 0755 cachefilesd $(DESTDIR)$(SBINDIR)/cachefilesd $(INSTALL) -D -m 0644 cachefilesd.conf $(DESTDIR)$(ETCDIR)/cachefilesd.conf $(INSTALL) -D -m 0644 cachefilesd.conf.5 $(MAN5)/cachefilesd.conf.5 $(INSTALL) -D -m 0644 cachefilesd.8 $(MAN8)/cachefilesd.8 diff --git a/redhat/cachefilesd.spec b/redhat/cachefilesd.spec index bc35b4e..814dbcb 100644 --- a/redhat/cachefilesd.spec +++ b/redhat/cachefilesd.spec @@ -21,6 +21,8 @@ The cachefilesd daemon manages the caching files and directory that are that are used by network file systems such a AFS and NFS to do persistent caching to the local disk. +%define docdir %{_docdir}/cachefilesd + %prep %setup -q @@ -33,21 +35,28 @@ PIE="-fpie" export PIE CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE`" -make all CFLAGS="$CFLAGS" +make all \ + ETCDIR=%{_sysconfdir} \ + SBINDIR=%{_sbindir} \ + MANDIR=%{_mandir} \ + CFLAGS="-Wall $RPM_OPT_FLAGS -Werror" %install rm -rf %{buildroot} -mkdir -p %{buildroot}/sbin +mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_unitdir} 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}%{docdir} mkdir -p %{buildroot}%{_localstatedir}/cache/fscache -make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} install \ + ETCDIR=%{_sysconfdir} \ + SBINDIR=%{_sbindir} \ + MANDIR=%{_mandir} \ + CFLAGS="-Wall $RPM_OPT_FLAGS -Werror" install -m 644 cachefilesd.conf %{buildroot}%{_sysconfdir} install -m 644 cachefilesd.service %{buildroot}%{_unitdir}/cachefilesd.service -install -m 644 selinux/move-cache.txt %{buildroot}/usr/share/doc/%{name}-%{version}/ +install -m 644 selinux/move-cache.txt %{buildroot}%{docdir} %clean rm -rf $RPM_BUILD_ROOT @@ -81,7 +90,7 @@ fi %doc selinux/*.if %doc selinux/*.te %config(noreplace) %{_sysconfdir}/cachefilesd.conf -/sbin/* +%{_sbindir}/* %{_unitdir}/* %{_mandir}/*/* %{_localstatedir}/cache/fscache @@ -132,13 +141,13 @@ fi * Mon Jul 2 2007 David Howells <dhowells@redhat.com> 0.8-16 - Use stat64/fstatat64 to avoid EOVERFLOW errors from the kernel on large files. -* Tue Nov 15 2006 David Howells <dhowells@redhat.com> 0.8-15 +* Tue Nov 14 2006 David Howells <dhowells@redhat.com> 0.8-15 - Made cachefilesd ask the kernel whether cullable objects are in use and omit them from the cull table if they are. - Made the size of cachefilesd's culling tables configurable. - Updated the manual pages. -* Mon Nov 14 2006 David Howells <dhowells@redhat.com> 0.8-14 +* Mon Nov 13 2006 David Howells <dhowells@redhat.com> 0.8-14 - Documented SELinux interaction. * Fri Nov 10 2006 David Howells <dhowells@redhat.com> 0.8-11 @@ -170,7 +179,7 @@ fi - Added postun and preun rules so cachefilesd is stopped and started when the rpm is updated or removed. -* Tue Aug 7 2006 Jesse Keating <jkeating@redhat.com> 0.4-2 +* Tue Aug 8 2006 Jesse Keating <jkeating@redhat.com> 0.4-2 - require /sbin/chkconfig not /usr/bin/chkconfig * Tue Aug 1 2006 David Howells <dhowells@redhat.com> 0.4-1 |