rpms/cups/FC-5 .cvsignore, 1.21, 1.22 cups-direct-usb.patch, 1.3, 1.4 cups.spec, 1.224, 1.225 sources, 1.23, 1.24

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8935

Modified Files:
        .cvsignore cups-direct-usb.patch cups.spec sources 
Log Message:
* Mon Oct 23 2006 Tim Waugh <twaugh@xxxxxxxxxx> 1:1.2.5-1.1
- 1.2.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore  22 Sep 2006 17:10:54 -0000      1.21
+++ .cvsignore  23 Oct 2006 13:49:36 -0000      1.22
@@ -12,3 +12,4 @@
 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

cups-direct-usb.patch:
 usb-unix.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

Index: cups-direct-usb.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-direct-usb.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cups-direct-usb.patch       14 Jul 2006 12:06:27 -0000      1.3
+++ cups-direct-usb.patch       23 Oct 2006 13:49:36 -0000      1.4
@@ -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
    {


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- cups.spec   22 Sep 2006 17:10:54 -0000      1.224
+++ cups.spec   23 Oct 2006 13:49:36 -0000      1.225
@@ -4,8 +4,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.2.4
-Release: 1.1
+Version: 1.2.5
+Release: 1%{?dist}.1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -336,6 +336,7 @@
 %{_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
@@ -403,6 +404,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon Oct 23 2006 Tim Waugh <twaugh@xxxxxxxxxx> 1:1.2.5-1.1
+- 1.2.5.
+
 * Fri Sep 22 2006 Tim Waugh <twaugh@xxxxxxxxxx> 1:1.2.4-1.1
 - 1.2.4 (fixes bug #206763).  No longer need str1968 patch.
 - No longer need no-propagate-ipp-port patch.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources     22 Sep 2006 17:10:54 -0000      1.23
+++ sources     23 Oct 2006 13:49:36 -0000      1.24
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-528650aba3b56541f75370ef09541850  cups-1.2.4-source.tar.bz2
+3e5d2c127890fd3ed97e2249c278b6e8  cups-1.2.5-source.tar.bz2

-- 
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits