Merge branch 'f21'

cups-systemd-socket.patch

@@ -43,6 +43,7 @@ diff -up cups-2.0.0/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.0.
 +++ cups-2.0.0/scheduler/org.cups.cupsd.service.in	2014-10-16 14:39:28.636650224 +0100
 @@ -2,9 +2,10 @@
  Description=CUPS Scheduler
++After=network.target
  
  [Service]
 -ExecStart=@sbindir@/cupsd -l
@@ -53,4 +54,3 @@ diff -up cups-2.0.0/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.0.
  [Install]
  Also=org.cups.cupsd.socket org.cups.cupsd.path
  WantedBy=printer.target
-+After=network.target

cups.spec

@@ -11,7 +11,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 2.0.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Url: http://www.cups.org/
 Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
@@ -610,6 +610,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Sat Oct 18 2014 Tim Waugh <twaugh@redhat.com> - 1:2.0.0-7
+- Fix for last fix (bug #1153660, bug #1154284).
+
 * Thu Oct 16 2014 Tim Waugh <twaugh@redhat.com> - 1:2.0.0-6
 - Start cupsd systemd service after network.target (bug #1153660).