From 8f0d3dc4f22ef7fc4a6bf5b32424b4b48f5ac47f Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Oct 23 2006 15:58:48 +0000
Subject: - 1.2.5.


---

diff --git a/.cvsignore b/.cvsignore
index 89598e8..768e8c0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -14,3 +14,4 @@ cups-1.2.1-source.tar.bz2
 cups-1.2.2-source.tar.bz2
 cups-1.2.3-source.tar.bz2
 cups-1.2.4-source.tar.bz2
+cups-1.2.5-source.tar.bz2
diff --git a/cups-direct-usb.patch b/cups-direct-usb.patch
index a213359..ee2d18b 100644
--- a/cups-direct-usb.patch
+++ b/cups-direct-usb.patch
@@ -1,15 +1,15 @@
---- cups-1.2.1/backend/usb-unix.c.direct-usb	2006-07-04 17:50:28.000000000 +0100
-+++ cups-1.2.1/backend/usb-unix.c	2006-07-04 17:51:56.000000000 +0100
-@@ -85,6 +85,8 @@
-     */
+--- cups-1.2.5/backend/usb-unix.c.direct-usb	2006-10-12 20:19:47.000000000 +0100
++++ cups-1.2.5/backend/usb-unix.c	2006-10-23 14:15:36.000000000 +0100
+@@ -86,6 +86,8 @@
  
-     use_bc = strcasecmp(hostname, "Canon") != 0;
+     use_bc = strcasecmp(hostname, "Canon") != 0 ||
+              strstr(hostname, "Minolta") != NULL;
 +    if (use_bc && !strncmp(uri, "usb:/dev/", 9))
 +      use_bc = 0;
  
      if ((device_fd = open_device(uri, &use_bc)) == -1)
      {
-@@ -327,12 +329,7 @@
+@@ -303,12 +305,7 @@
    if (!strncmp(uri, "usb:/dev/", 9))
  #ifdef __linux
    {
diff --git a/cups.spec b/cups.spec
index 431a965..43b157d 100644
--- a/cups.spec
+++ b/cups.spec
@@ -5,8 +5,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.2.4
-Release: 9
+Version: 1.2.5
+Release: 10%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -348,6 +348,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_docdir}/cups-%{version}/images
 %{_docdir}/cups-%{version}/de
 %{_docdir}/cups-%{version}/es
+%{_docdir}/cups-%{version}/et
 %{_docdir}/cups-%{version}/ja
 %{_docdir}/cups-%{version}/pl
 %{_docdir}/cups-%{version}/sv
@@ -415,6 +416,9 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon Oct 23 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.5-10
+- 1.2.5.
+
 * Tue Oct 17 2006 Tim Waugh <twaugh@redhat.com>
 - Feature-complete LSPP patch from Matt Anderson (bug #210542).
 
diff --git a/sources b/sources
index 285be11..62eb2be 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-528650aba3b56541f75370ef09541850  cups-1.2.4-source.tar.bz2
+3e5d2c127890fd3ed97e2249c278b6e8  cups-1.2.5-source.tar.bz2