diff options
| author | David Howells <dhowells@redhat.com> | 2011-11-30 12:19:50 +0000 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2011-11-30 12:19:50 +0000 |
| commit | 820eaa67e49804430b565ca44fc6ba283aa4d708 (patch) | |
| tree | 669257a6607215a51a70b64f5d44c4dfc4394570 | |
| parent | 8d81bb2ac457751764682b2307a59778c7882aa6 (diff) | |
| download | cachefilesd-820eaa67e49804430b565ca44fc6ba283aa4d708.tar.gz | |
Fix rpmlint complaints
Provide a makefile rule to run rpmlint on the RPMs it has built.
Fix the complaints made by rpmlint.
Signed-off-by: David Howells <dhowells@redhat.com>
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | cachefilesd.conf.5 | 4 | ||||
| -rw-r--r-- | redhat/cachefilesd.spec | 33 |
3 files changed, 24 insertions, 18 deletions
@@ -105,11 +105,16 @@ RPMFLAGS := \ --define "buildid $(BUILDID)" rpm: + mkdir -p rpmbuild + chmod ug-s rpmbuild mkdir -p rpmbuild/{SPECS,SOURCES,BUILD,BUILDROOT,RPMS,SRPMS} git archive --prefix=cachefilesd-$(VERSION)/ --format tar -o $(SRCBALL) HEAD rpmbuild -ts $(SRCBALL) --define "_srcrpmdir rpmbuild/SRPMS" $(RPMFLAGS) rpmbuild --rebuild $(SRPM) $(RPMBUILDDIRS) $(RPMFLAGS) +rpmlint: rpm + rpmlint $(SRPM) $(CURDIR)/rpmbuild/RPMS/*/cachefilesd-{,debuginfo-}$(rpmver).*.rpm + ############################################################################### # # Build debugging diff --git a/cachefilesd.conf.5 b/cachefilesd.conf.5 index 8cf617b..93d56a2 100644 --- a/cachefilesd.conf.5 +++ b/cachefilesd.conf.5 @@ -173,5 +173,5 @@ Culling can be disabled with the \fBnocull\fP option. .SH SEE ALSO \fBcachefilesd\fR(8), \fBdf\fR(1), /usr/share/doc/cachefilesd-*/README .SH AUTHORS -The cachefilesd software has been developed by David Howells -.Aq dhowells@redhat.com . +.br +David Howells <dhowells@redhat.com> diff --git a/redhat/cachefilesd.spec b/redhat/cachefilesd.spec index 569eca2..8b8e024 100644 --- a/redhat/cachefilesd.spec +++ b/redhat/cachefilesd.spec @@ -1,25 +1,25 @@ # % define buildid .local -Name: cachefilesd -Version: 0.10.3 -Release: 1%{?dist}%{?buildid} -Summary: CacheFiles userspace management daemon -Group: System Environment/Daemons -License: GPL -URL: http://people.redhat.com/~dhowells/fscache/ -Source0: http://people.redhat.com/dhowells/fscache/cachefilesd-%{version}.tar.bz2 - -BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) +Name: cachefilesd +Version: 0.10.3 +Release: 1%{?dist}%{?buildid} +Summary: CacheFiles user-space management daemon +Group: System Environment/Daemons +License: GPLv2 +URL: http://people.redhat.com/~dhowells/fscache/ +Source0: http://people.redhat.com/dhowells/fscache/cachefilesd-%{version}.tar.bz2 + +BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) BuildRequires: systemd-units Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -Requires: selinux-policy-base >= 3.7.19-5 +Requires: selinux-policy-base >= 3.7.19-5 %description -The cachefilesd daemon manages the caching files and directory that are -that are used by network filesystems such a AFS and NFS to -do persistent caching to the local disk. +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. %prep %setup -q @@ -53,8 +53,8 @@ install -m 644 selinux/move-cache.txt %{buildroot}/usr/share/doc/%{name}-%{versi rm -rf $RPM_BUILD_ROOT %post -if [ $1 -eq 1 ] ; then - # Initial installation +if [ $1 -eq 1 ] ; then + # Initial installation /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi @@ -89,6 +89,7 @@ fi %changelog * Wed Nov 30 2011 David Howells <dhowells@redhat.com> - Fix packaging of systemd service file. +- Fix rpmlint complaints. * Tue Nov 22 2011 David Howells <dhowells@redhat.com> 0.10.3-1 - Move to native systemd management [RH BZ 754811]. |