diff --git a/.cvsignore b/.cvsignore index f4bb61f..b9ac4ef 100644 --- a/.cvsignore +++ b/.cvsignore @@ -16,3 +16,4 @@ cups-1.2.3-source.tar.bz2 cups-1.2.4-source.tar.bz2 cups-1.2.5-source.tar.bz2 cups-1.2.6-source.tar.bz2 +cups-1.2.7-source.tar.bz2 diff --git a/cups-direct-usb.patch b/cups-direct-usb.patch index ee2d18b..b6a2eb7 100644 --- a/cups-direct-usb.patch +++ b/cups-direct-usb.patch @@ -1,15 +1,15 @@ ---- 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 @@ +--- cups-1.2.7/backend/usb-unix.c.direct-usb 2006-11-15 20:28:39.000000000 +0000 ++++ cups-1.2.7/backend/usb-unix.c 2006-11-16 16:23:51.000000000 +0000 +@@ -85,6 +85,8 @@ + */ - use_bc = strcasecmp(hostname, "Canon") != 0 || - strstr(hostname, "Minolta") != NULL; + use_bc = strcasecmp(hostname, "Canon") && !strstr(hostname, "Minolta"); + if (use_bc && !strncmp(uri, "usb:/dev/", 9)) + use_bc = 0; if ((device_fd = open_device(uri, &use_bc)) == -1) { -@@ -303,12 +305,7 @@ +@@ -302,12 +304,7 @@ if (!strncmp(uri, "usb:/dev/", 9)) #ifdef __linux { diff --git a/cups.spec b/cups.spec index be8cf44..42196dc 100644 --- a/cups.spec +++ b/cups.spec @@ -5,8 +5,8 @@ Summary: Common Unix Printing System Name: cups -Version: 1.2.6 -Release: 5%{?dist} +Version: 1.2.7 +Release: 2%{?dist} License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -357,6 +357,7 @@ rm -rf $RPM_BUILD_ROOT %{_docdir}/cups-%{version}/de %{_docdir}/cups-%{version}/es %{_docdir}/cups-%{version}/et +%{_docdir}/cups-%{version}/it %{_docdir}/cups-%{version}/ja %{_docdir}/cups-%{version}/pl %{_docdir}/cups-%{version}/sv @@ -424,6 +425,9 @@ rm -rf $RPM_BUILD_ROOT %{cups_serverbin}/daemon/cups-lpd %changelog +* Thu Nov 16 2006 Tim Waugh 1:1.2.7-2 +- 1.2.7. + * Tue Nov 14 2006 Tim Waugh - Fixed LogFilePerm. diff --git a/sources b/sources index 422f25f..afdcc24 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ b0bb017098e8e76b8a25e666c41ce540 postscript.ppd.gz -0669ad19cc8429af6e17176831aa3ed4 cups-1.2.6-source.tar.bz2 +bf44783d9b46130bee9f2995e6055470 cups-1.2.7-source.tar.bz2