rpms/hplip/devel hplip-1.7.1-1.patch, NONE, 1.1 hplip-hpfax.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 hplip.spec, 1.104, 1.105 sources, 1.15, 1.16

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15069

Modified Files:
	.cvsignore hplip.spec sources 
Added Files:
	hplip-1.7.1-1.patch hplip-hpfax.patch 
Log Message:
* Wed Feb 14 2007 Tim Waugh <twaugh at redhat.com> 1.7.1-1
- 1.7.1.


hplip-1.7.1-1.patch:
 dj3320.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hplip-1.7.1-1.patch ---
diff -uNr hplip-1.7.1_old/prnt/hpijs/dj3320.cpp hplip-1.7.1_new/prnt/hpijs/dj3320.cpp
--- hplip-1.7.1_old/prnt/hpijs/dj3320.cpp	2007-01-24 15:42:03.000000000 -0800
+++ hplip-1.7.1_new/prnt/hpijs/dj3320.cpp	2007-01-31 13:33:42.000000000 -0800
@@ -3066,7 +3066,7 @@
     }
 
     // Send Sync packet
-    err = pPrinterXBow->Send (pbySync, (DWORD) sizeof (pbySync));
+    err = pPrinterXBow->Send (pbySync, SYNCSIZE);
     if(err)
     {
         return err;

hplip-hpfax.patch:
 hpfax.py |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hplip-hpfax.patch ---
--- hplip-1.7.1/fax/backend/hpfax.py.hpfax	2007-02-14 17:37:49.000000000 +0000
+++ hplip-1.7.1/fax/backend/hpfax.py	2007-02-14 17:38:28.000000000 +0000
@@ -126,7 +126,7 @@
         except Error:
             continue
 
-        print 'direct %s "HP Fax" "%s HP Fax" "MFG:HP;MDL:Fax;DES:HP Fax;"' % (uri, model)
+        print 'direct %s "HP Fax" "%s HP Fax" "MFG:HP;MDL:Fax;DES:HP Fax;"' % ('hpfax' + uri[2:], model)
         good_devices += 1
 
     if not good_devices:


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	10 Jan 2007 15:58:14 -0000	1.15
+++ .cvsignore	14 Feb 2007 17:39:22 -0000	1.16
@@ -12,3 +12,4 @@
 hplip-1.6.7.tar.gz
 hplip-1.6.10.tar.gz
 hplip-1.6.12.tar.gz
+hplip-1.7.1.tar.gz


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- hplip.spec	10 Jan 2007 16:14:44 -0000	1.104
+++ hplip.spec	14 Feb 2007 17:39:22 -0000	1.105
@@ -1,6 +1,6 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 1.6.12
+Version: 1.7.1
 Release: 1%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
@@ -13,12 +13,14 @@
 
 Url: http://hplip.sourceforge.net/
 Source: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
+Patch0: hplip-1.7.1-1.patch
 Patch1: hplip-desktop.patch
 Patch2: hplip-guest.patch
 Patch3: hplip-quiet.patch
 Patch4: hplip-cups-backend.patch
 Patch5: hplip-libm.patch
 Patch6: hplip-ipv6.patch
+Patch7: hplip-hpfax.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -66,6 +68,8 @@
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
 
+%patch0 -p1 -b .1.7.1-1
+
 # Use /usr/share/applications for putting desktop files in.
 %patch1 -p1 -b .desktop
 
@@ -81,6 +85,9 @@
 # IPv6 support (bug #198377).
 %patch6 -p1 -b .ipv6
 
+# Fix hpfax backend device query.
+%patch7 -p1 -b .hpfax
+
 autoconf # for patch4
 
 %build
@@ -181,6 +188,9 @@
 exit 0
 
 %changelog
+* Wed Feb 14 2007 Tim Waugh <twaugh at redhat.com> 1.7.1-1
+- 1.7.1.
+
 * Wed Jan 10 2007 Tim Waugh <twaugh at redhat.com> 1.6.12-1
 - 1.6.12.  No longer need broken-conf, loop, out-of-paper or
   sane-debug patches.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	10 Jan 2007 15:58:14 -0000	1.15
+++ sources	14 Feb 2007 17:39:22 -0000	1.16
@@ -1 +1 @@
-8adcb93703f6e90510f51b3cf96567c9  hplip-1.6.12.tar.gz
+1732a8544413ba8557c8b71929d848fa  hplip-1.7.1.tar.gz