Hello community, here is the log from the commit of package cups checked in at Thu Apr 13 15:07:26 CEST 2006. -------- --- cups/cups.changes 2006-01-25 21:35:16.000000000 +0100 +++ STABLE/cups/cups.changes 2006-04-11 17:10:03.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 11 17:09:39 CEST 2006 - kssingvo@suse.de + +- fixed the usb naming for special HP printers (bugzilla#163833) + +------------------------------------------------------------------- New: ---- cups-1.1.23-usb_descr.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups.spec ++++++ --- /var/tmp/diff_new_pack.9aMMYp/_old 2006-04-13 15:06:27.000000000 +0200 +++ /var/tmp/diff_new_pack.9aMMYp/_new 2006-04-13 15:06:27.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -17,7 +17,7 @@ Group: Hardware/Printing Summary: The Common UNIX Printing System Version: 1.1.23 -Release: 26 +Release: 35 Requires: cups-libs = %{version}, cups-client = %{version} Requires: ghostscript_any, ghostscript-fonts-std, foomatic-filters Requires: util-linux, /usr/bin/ionice @@ -63,6 +63,7 @@ Patch24: cups-1.1.23-cupstestppd.patch Patch25: cups-1.1.23-printcap_info.patch Patch26: cups-1.1.23-xpdf3.patch +Patch27: cups-1.1.23-usb_descr.patch Patch100: cups-1.1.23-testpage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version >= 801 @@ -167,6 +168,7 @@ %patch24 -p1 %patch25 -p1 %patch26 -p1 +%patch27 -p1 if [ -f /.buildenv ]; then . /.buildenv else @@ -417,6 +419,8 @@ %{_libdir}/libcupsimage.so* %changelog -n cups +* Tue Apr 11 2006 - kssingvo@suse.de +- fixed the usb naming for special HP printers (bugzilla#163833) * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Sat Jan 14 2006 - lmuelle@suse.de ++++++ cups-1.1.23-usb_descr.patch ++++++ --- cups-1.1.23/backend/usb-unix.c.orig 2005-01-03 20:29:44.000000000 +0100 +++ cups-1.1.23/backend/usb-unix.c 2006-04-11 15:57:28.000000000 +0200 @@ -271,6 +271,34 @@ else if ((attr = strstr(device_id, "DESCRIPTION:")) != NULL) attr += 12; + if (attr) + { + if ((delim = strchr(attr, ';')) == NULL) + delim = attr + strlen(attr); + if ((delim - attr) < 8) + { + // we require the description to be 8 or more characters in length + attr = NULL; + } + else + { + // and require to contain at least one space and one letter + char *ptr; + int letters = 0, spaces = 0; + for (ptr = attr; ptr < delim; ptr ++) + { + if (isspace(*ptr & 255)) + spaces++; + else if (isalpha(*ptr & 255)) + letters++; + if (spaces && letters) + break; + } + if (!spaces || !letters) + attr = NULL; + } + } + if ((mfg = strstr(device_id, "MANUFACTURER:")) != NULL) mfg += 13; else if ((mfg = strstr(device_id, "MFG:")) != NULL) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...