[cups] Don't enable IP-based systemd socket activation by default (bug #842365).

[Tim Waugh]

commit 6ef39188975c03f6132a98c8cad20ce80b3d95d9
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Jul 24 16:43:58 2012 +0100

    Don't enable IP-based systemd socket activation by default (bug #842365).
    
    Resolves: rhbz#842365

 cups-systemd-socket.patch |    5 +----
 cups.spec                 |    5 ++++-
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index 09d17d4..234555f 100644
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -117,15 +117,12 @@ diff -up cups-1.5.2/data/cups.service.in.systemd-socket cups-1.5.2/data/cups.ser
 diff -up cups-1.5.2/data/cups.socket.in.systemd-socket cups-1.5.2/data/cups.socket.in
 --- cups-1.5.2/data/cups.socket.in.systemd-socket	2012-03-16 14:50:57.150449788 +0000
 +++ cups-1.5.2/data/cups.socket.in	2012-03-16 14:50:57.150449788 +0000
-@@ -0,0 +1,11 @@
+@@ -0,0 +1,8 @@
 +[Unit]
 +Description=CUPS Printing Service Sockets
 +
 +[Socket]
 +ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-+ListenStream=631
-+ListenDatagram=0.0.0.0:631
-+BindIPv6Only=ipv6-only
 +
 +[Install]
 +WantedBy=sockets.target
diff --git a/cups.spec b/cups.spec
index 12fdce1..002ecca 100644
--- a/cups.spec
+++ b/cups.spec
@@ -12,7 +12,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.5.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -656,6 +656,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man1/ipptool.1.gz
 
 %changelog
+* Tue Jul 24 2012 Tim Waugh <twaugh at redhat.com> 1:1.5.3-5
+- Don't enable IP-based systemd socket activation by default (bug #842365).
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.5.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild