From fd757a5dc2c48f1af6caeb0ef71941783e2f3ce6 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 30 Nov 2011 12:44:29 +0000
Subject: [PATCH] Move to version 0.10.4

- Fix packaging of systemd service file.
- Fix rpmlint complaints.
---
 .gitignore       |  1 +
 cachefilesd.spec | 35 ++++++++++++++++++++---------------
 sources          |  2 +-
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index ee18a24..ebc477e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ cachefilesd-0.9.tar.bz2
 cachefilesd-0.10.tar.bz2
 cachefilesd-0.10.1.tar.bz2
 /cachefilesd-0.10.3.tar.bz2
+/cachefilesd-0.10.4.tar.bz2
diff --git a/cachefilesd.spec b/cachefilesd.spec
index 34d1911..c08bdc6 100644
--- a/cachefilesd.spec
+++ b/cachefilesd.spec
@@ -1,24 +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
+Name:		cachefilesd
+Version:	0.10.4
+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)
+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
@@ -52,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
 
@@ -86,6 +87,10 @@ fi
 %{_localstatedir}/cache/fscache
 
 %changelog
+* Wed Nov 30 2011 David Howells <dhowells@redhat.com> 0.10.4-1
+- 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].
 
diff --git a/sources b/sources
index 8dd93ae..6e051ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d77f692876d779c3c931a18fc2e10a1b  cachefilesd-0.10.3.tar.bz2
+6066f66586180f845f414a7e651b7483  cachefilesd-0.10.4.tar.bz2