From 442919f148918bf6fb095ccbb77bc80322c2e8de Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Oct 18 2014 14:02:28 +0000 Subject: Fix for last fix (bug #1153660, bug #1154284). Resolves: rhbz#1153660 rhbz#1154284 (cherry picked from commit 3555918139f0ba4021a504c129840d13b234f100) --- diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch index 44dbf5e..a5068bd 100644 --- a/cups-systemd-socket.patch +++ b/cups-systemd-socket.patch @@ -100,6 +100,7 @@ @@ -0,0 +1,12 @@ +[Unit] +Description=CUPS Printing Service ++After=network.target + +[Service] +Type=notify @@ -109,7 +110,6 @@ +[Install] +Also=cups.socket cups.path +WantedBy=printer.target -+After=network.target --- cups-1.7.2/data/cups.socket.in.systemd-socket 2014-04-17 14:05:04.105472002 +0200 +++ cups-1.7.2/data/cups.socket.in 2014-04-17 14:05:04.105472002 +0200 @@ -0,0 +1,8 @@ diff --git a/cups.spec b/cups.spec index 6326d8f..bc7ac96 100644 --- a/cups.spec +++ b/cups.spec @@ -11,7 +11,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 1.7.5 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 Url: http://www.cups.org/ Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2 @@ -684,6 +684,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Sat Oct 18 2014 Tim Waugh - 1:1.7.5-11 +- Fix for last fix (bug #1153660, bug #1154284). + * Thu Oct 16 2014 Tim Waugh - 1:1.7.5-10 - Start cups.service after network.target (bug #1153660).