- 2.8.2. No longer need alloc, unload-traceback or media-empty patches.
- Ship cupsddk driver. The hpijs sub-package now requires cupsddk-drivers.
This commit is contained in:
Tim Waugh
parent
d0a92cc8b5
commit
3b640ba364
@ -20,3 +20,4 @@ hplip-2.7.7.tar.gz
|
||||
hplip-2.7.9.tar.gz
|
||||
hplip-2.7.10.tar.gz
|
||||
hplip-2.7.12.tar.gz
|
||||
hplip-2.8.2.tar.gz
|
||||
|
||||
@ -1,16 +1,17 @@
|
||||
--- hplip-2.7.6/prnt/hpijs/hpijs.cpp.marker-supply 2007-07-16 18:19:31.000000000 +0100
|
||||
+++ hplip-2.7.6/prnt/hpijs/hpijs.cpp 2007-07-16 18:19:43.000000000 +0100
|
||||
@@ -534,11 +534,11 @@
|
||||
diff -up hplip-2.8.2/prnt/hpijs/hpijs.cpp.marker-supply hplip-2.8.2/prnt/hpijs/hpijs.cpp
|
||||
--- hplip-2.8.2/prnt/hpijs/hpijs.cpp.marker-supply 2008-02-08 19:36:38.000000000 +0000
|
||||
+++ hplip-2.8.2/prnt/hpijs/hpijs.cpp 2008-03-04 17:51:02.000000000 +0000
|
||||
@@ -541,11 +541,11 @@ int main (int argc, char *argv[], char *
|
||||
case WARN_LOW_INK_YELLOW:
|
||||
case WARN_LOW_INK_MULTIPLE_PENS:
|
||||
{
|
||||
- bug ("STATE: marker-supply-low\n");
|
||||
+ bug ("STATE: +marker-supply-low-warning\n");
|
||||
break;
|
||||
}
|
||||
{
|
||||
- bug ("STATE: marker-supply-low-warning\n");
|
||||
+ bug ("STATE: +marker-supply-low-warning\n");
|
||||
break;
|
||||
}
|
||||
default:
|
||||
- bug ("STATE: -marker-supply-low");
|
||||
+ bug ("STATE: -marker-supply-low-warning\n");
|
||||
- bug ("STATE: -marker-supply-low-warning");
|
||||
+ bug ("STATE: -marker-supply-low-warning\n");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
diff -up hplip-2.7.12/prnt/backend/hp.c.media-empty hplip-2.7.12/prnt/backend/hp.c
|
||||
--- hplip-2.7.12/prnt/backend/hp.c.media-empty 2007-11-29 00:17:27.000000000 +0000
|
||||
+++ hplip-2.7.12/prnt/backend/hp.c 2008-01-18 14:37:11.000000000 +0000
|
||||
@@ -517,10 +517,12 @@ bugout:
|
||||
}
|
||||
|
||||
/* Check printer status, if in an error state, loop until error condition is cleared. */
|
||||
+/* XXX What if it is immediately replaced by a different error condition? XXX */
|
||||
static int loop_test(HPMUD_DEVICE dd, HPMUD_CHANNEL cd, struct pjl_attributes *pa, const char *uri, const char *job)
|
||||
{
|
||||
- int retry=0, status;
|
||||
+ int status;
|
||||
const char *pstate;
|
||||
+ const char *emitted_state_reason = NULL;
|
||||
|
||||
while (1)
|
||||
{
|
||||
@@ -529,27 +531,26 @@ static int loop_test(HPMUD_DEVICE dd, HP
|
||||
|
||||
if (strcmp(pstate, "none")==0)
|
||||
{
|
||||
- if (retry)
|
||||
+ if (emitted_state_reason)
|
||||
{
|
||||
/* Clear error. */
|
||||
device_event(uri, job, VSTATUS_PRNT, "event", 0);
|
||||
fputs("INFO: Printing...\n", stderr);
|
||||
- fprintf(stderr, "STATE: -%s\n", pstate);
|
||||
- retry=0;
|
||||
+ fprintf(stderr, "STATE: -%s\n", emitted_state_reason);
|
||||
}
|
||||
break; /* no error, done */
|
||||
}
|
||||
|
||||
- if (!retry)
|
||||
+ if (!emitted_state_reason)
|
||||
{
|
||||
/* Display error. */
|
||||
device_event(uri, job, status, "error", RETRY_TIMEOUT);
|
||||
- fprintf(stderr, "STATE: +%s\n", pstate);
|
||||
+ emitted_state_reason = pstate;
|
||||
+ fprintf(stderr, "STATE: +%s\n", emitted_state_reason);
|
||||
}
|
||||
|
||||
BUG("ERROR: %d %s; will retry in %d seconds...\n", status, pstate, RETRY_TIMEOUT);
|
||||
sleep(RETRY_TIMEOUT);
|
||||
- retry = 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
@ -1,17 +0,0 @@
|
||||
--- hplip-1.7.2/ui/scrollfunc.py.unload-traceback 2007-05-10 12:13:17.000000000 +0100
|
||||
+++ hplip-1.7.2/ui/scrollfunc.py 2007-05-10 12:13:58.000000000 +0100
|
||||
@@ -176,5 +176,14 @@
|
||||
self.addControl(widget, str(title))
|
||||
|
||||
|
||||
+ def FailureUI(self, error_text):
|
||||
+ log.error(str(error_text).replace("<b>", "").replace("</b>", "").replace("<p>", ""))
|
||||
+ QMessageBox.critical(self,
|
||||
+ self.caption(),
|
||||
+ error_text,
|
||||
+ QMessageBox.Ok,
|
||||
+ QMessageBox.NoButton,
|
||||
+ QMessageBox.NoButton)
|
||||
+
|
||||
def __tr(self,s,c = None):
|
||||
return qApp.translate("DevMgr4",s,c)
|
||||
25
hplip.spec
25
hplip.spec
@ -1,7 +1,7 @@
|
||||
Summary: HP Linux Imaging and Printing Project
|
||||
Name: hplip
|
||||
Version: 2.7.12
|
||||
Release: 6%{?dist}
|
||||
Version: 2.8.2
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+ and MIT
|
||||
Group: System Environment/Daemons
|
||||
Conflicts: system-config-printer < 0.6.132
|
||||
@ -19,10 +19,7 @@ Patch2: hplip-gzip-n.patch
|
||||
Patch3: hplip-quiet.patch
|
||||
Patch4: hplip-marker-supply.patch
|
||||
Patch5: hplip-libm.patch
|
||||
Patch6: hplip-alloc.patch
|
||||
Patch8: hplip-libsane.patch
|
||||
Patch9: hplip-media-empty.patch
|
||||
Patch11: hplip-unload-traceback.patch
|
||||
Patch12: hplip-no-root-config.patch
|
||||
Patch13: hplip-ui-optional.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
@ -71,6 +68,7 @@ License: BSD
|
||||
Epoch: %{hpijs_epoch}
|
||||
Requires: python-reportlab
|
||||
Requires: net-snmp
|
||||
Requires: cupsddk-drivers
|
||||
|
||||
%description -n hpijs
|
||||
hpijs is a collection of optimized drivers for HP printers.
|
||||
@ -109,18 +107,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
|
||||
# libhpip should link against libm (bug #197599).
|
||||
%patch5 -p1 -b .libm
|
||||
|
||||
# The hpijs compression module doesn't allocate enough memory (bug #428536).
|
||||
%patch6 -p1 -b .alloc
|
||||
|
||||
# Link libsane-hpaio against libsane (bug #234813).
|
||||
%patch8 -p1 -b .libsane
|
||||
|
||||
# Clear the media-empty-error printer state.
|
||||
%patch9 -p1 -b .media-empty
|
||||
|
||||
# Prevent a traceback when unloading a photo card (bug #238617).
|
||||
%patch11 -p1 -b .unload-traceback
|
||||
|
||||
# Prevent SELinux audit message from the CUPS backends (bug #241776)
|
||||
%patch12 -p1 -b .no-root-config
|
||||
|
||||
@ -131,7 +120,8 @@ autoconf # for patch4
|
||||
|
||||
%build
|
||||
%configure --disable-foomatic-xml-install --disable-cups-install \
|
||||
--enable-scan-build --enable-gui-build --enable-fax-build
|
||||
--enable-scan-build --enable-gui-build --enable-fax-build \
|
||||
--disable-foomatic-rip-hplip-install
|
||||
make hpppddir=%{_datadir}/foomatic/db/source/PPD/HP
|
||||
|
||||
%install
|
||||
@ -257,6 +247,7 @@ rm -rf %{buildroot}
|
||||
%{_libdir}/libhpmud.so*
|
||||
%{_bindir}/hpijs
|
||||
%{_datadir}/foomatic/db/source/PPD/HP
|
||||
%{_datadir}/cups/drv/*
|
||||
|
||||
%files -n libsane-hpaio
|
||||
%defattr(-,root,root)
|
||||
@ -284,6 +275,10 @@ fi
|
||||
exit 0
|
||||
|
||||
%changelog
|
||||
* Tue Mar 4 2008 Tim Waugh <twaugh@redhat.com> 2.8.2-1
|
||||
- 2.8.2. No longer need alloc, unload-traceback or media-empty patches.
|
||||
- Ship cupsddk driver. The hpijs sub-package now requires cupsddk-drivers.
|
||||
|
||||
* Tue Mar 4 2008 Tim Waugh <twaugh@redhat.com> 2.7.12-6
|
||||
- Fixed marker-supply-low strings.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user