rpms/hplip/devel hplip-plugin-error.patch, NONE, 1.1 hplip.spec, 1.239, 1.240
Tim Waugh
twaugh at fedoraproject.org
Wed Oct 28 17:45:29 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5917
Modified Files:
hplip.spec
Added Files:
hplip-plugin-error.patch
Log Message:
* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-18
- Set a printer-state-reason when there's a missing required plugin
(bug #531330).
hplip-plugin-error.patch:
backend/hp.c | 2 +-
hpijs/hpcups.cpp | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE hplip-plugin-error.patch ---
diff -up hplip-3.9.8/prnt/backend/hp.c~ hplip-3.9.8/prnt/backend/hp.c
--- hplip-3.9.8/prnt/backend/hp.c~ 2009-10-28 17:03:27.435140391 +0000
+++ hplip-3.9.8/prnt/backend/hp.c 2009-10-28 17:12:15.709140073 +0000
@@ -575,7 +575,7 @@ static int loop_test(HPMUD_DEVICE dd, HP
if (first_time)
{
first_time = 0;
- old_state = ("media-empty-error,media-jam-error,"
+ old_state = ("media-empty-error,media-jam-error,hplip.plugin-error,"
"cover-open-error,toner-empty-error,other");
}
diff -up hplip-3.9.8/prnt/hpijs/hpcups.cpp~ hplip-3.9.8/prnt/hpijs/hpcups.cpp
--- hplip-3.9.8/prnt/hpijs/hpcups.cpp~ 2009-10-28 17:03:27.390139541 +0000
+++ hplip-3.9.8/prnt/hpijs/hpcups.cpp 2009-10-28 17:11:18.980140742 +0000
@@ -384,6 +384,7 @@ int HPCups::initContext (char **argv)
SendDbusMessage (device_uri, printer,
EVENT_PRINT_FAILED_MISSING_PLUGIN,
argv[2], atoi (argv[1]), argv[3]);
+ fputs ("STATE: +hplip.plugin-error\n", stderr);
BUG ("ERROR: unable to set device = %s, err = %d\n", attr->value, err);
return 1;
}
Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -p -r1.239 -r1.240
--- hplip.spec 29 Sep 2009 15:25:47 -0000 1.239
+++ hplip.spec 28 Oct 2009 17:45:28 -0000 1.240
@@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.9.8
-Release: 17%{?dist}
+Release: 18%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@@ -24,6 +24,7 @@ Patch8: hplip-non-scripts.patch
Patch9: hplip-requirespageregion.patch
Patch10: hplip-discovery-method.patch
Patch11: hplip-device-reconnected.patch
+Patch12: hplip-plugin-error.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(pre): /sbin/service
@@ -145,6 +146,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
# Give up trying to print a job to a reconnected device (bug #515481).
%patch11 -p1 -b .device-reconnected
+%patch12 -p1 -b .plugin-error
%build
aclocal
@@ -349,6 +351,10 @@ fi
/usr/bin/update-desktop-database &>/dev/null ||:
%changelog
+* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-18
+- Set a printer-state-reason when there's a missing required plugin
+ (bug #531330).
+
* Tue Sep 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-17
- Give up trying to print a job to a reconnected device (bug #515481).
More information about the fedora-extras-commits
mailing list