back to protocol version 2, RHBZ#978387 has been already fixed for a while...

diff --git a/cups-use-ipp1.1.patch b/cups-use-ipp1.1.patch
deleted file mode 100644 (file)
index 41855fc..0000000
--- a/cups-use-ipp1.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up cups-1.6.3/cups/usersys.c.use-ipp1.1 cups-1.6.3/cups/usersys.c
---- cups-1.6.3/cups/usersys.c.use-ipp1.1       2013-07-12 11:41:45.368837618 +0200
-+++ cups-1.6.3/cups/usersys.c  2013-07-12 11:41:45.391837299 +0200
-@@ -366,7 +366,7 @@ cupsSetServer(const char *server)  /* I -
-         cg->server_version = 22;
-     }
-     else
--      cg->server_version = 20;
-+      cg->server_version = 11;
- 
-     if (cg->server[0] != '/' && (port = strrchr(cg->server, ':')) != NULL &&
-         !strchr(port, ']') && isdigit(port[1] & 255))

diff --git a/cups.spec b/cups.spec
index 23375c63d925430f9b088505dc3766fa1bc15fa6..84c7d3459b20401a4908b09066add8d8dd47800e 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -39,7 +39,6 @@ Patch13:      %{name}-systemd-socket.patch
 Patch14:       add-ipp-backend-of-cups-1.4.patch
 Patch15:       reactivate_recommended_driver.patch
 Patch16:       read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch
-Patch17:       %{name}-use-ipp1.1.patch
 Patch18:       %{name}-final-content-type.patch
 # avahi patches from fedora
 Patch100:      %{name}-avahi-address.patch
@@ -254,7 +253,6 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%patch17 -p1
 %patch18 -p1
 
 %if %{with avahi}
@@ -334,7 +332,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{classes,printers}.conf
 
 cat >$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/client.conf <<'EOF'
 # Encryption Always
-# ServerName print.server.ip.or.name
+# ServerName enter.server.IP.or.name
 EOF
 
 # windows drivers can be put there.