[cups] Use PathExistsGlob instead of DirectoryNotEmpty in cups.path (bug #734435).
Tim Waugh
twaugh at fedoraproject.org
Thu Sep 1 11:36:53 UTC 2011
commit 929e106a6a0de1871ae3f8c24ccd6b15423bad83
Author: Tim Waugh <twaugh at redhat.com>
Date: Thu Sep 1 10:47:44 2011 +0100
Use PathExistsGlob instead of DirectoryNotEmpty in cups.path
(bug #734435).
cups-systemd-socket.patch | 2 +-
cups.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index 477ae0f..99472ae 100644
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -56,7 +56,7 @@ diff -up cups-1.5.0/data/cups.path.in.systemd-socket cups-1.5.0/data/cups.path.i
+Description=CUPS Printer Service Spool
+
+[Path]
-+DirectoryNotEmpty=@CUPS_REQUESTS@
++PathExistsGlob=@CUPS_REQUESTS@/d*
+
+[Install]
+WantedBy=multi-user.target
diff --git a/cups.spec b/cups.spec
index 5bd6d9e..ce073bd 100644
--- a/cups.spec
+++ b/cups.spec
@@ -13,7 +13,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.5.0
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -639,6 +639,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/ipptool.1.gz
%changelog
+* Thu Sep 1 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-7
+- Use PathExistsGlob instead of DirectoryNotEmpty in cups.path
+ (bug #734435).
+
* Fri Aug 19 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-6
- Tighten explicit libs sub-package requirement so that it includes
the correct architecture as well (bug #731421 comment #8).
More information about the scm-commits
mailing list