rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- 3.10.6.

Browse Source
This commit is contained in:
Jiří Popelka 2010-07-27 10:34:11 +00:00
parent 536ccf2345
commit f1d5f72a58
6 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -33,3 +33,4 @@ hplip-3.9.8.tar.gz
hplip-3.10.2.tar.gz hplip-3.10.2.tar.gz
hpcups-update-ppds.sh hpcups-update-ppds.sh
hplip-3.10.5.tar.gz hplip-3.10.5.tar.gz
hplip-3.10.6.tar.gz

7
hplip-3.10.5.tar.gz.asc
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEABECAAYFAkvrPtwACgkQc9dwzaWQR7kBQQCg5QMDPz05Oz1r9aQtk7drg8mQ
wxEAoMYrbJ7YkjqWyhsK/04y8tqZ022U
=H4Nc
-----END PGP SIGNATURE-----

7
hplip-3.10.6.tar.gz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEABECAAYFAkxDtwQACgkQc9dwzaWQR7nApgCcC0cVr7w9rEJdir1Gyl71m9rB
PEsAoK+qjoBn/ksBmhTiNQRYdr/XCE19
=MeCZ
-----END PGP SIGNATURE-----

17
hplip-bad-state-attr.patch
View File

@ -1,17 +0,0 @@
diff -up hplip-3.10.5/prnt/hpijs/hpijs.cpp.bad-state-attr hplip-3.10.5/prnt/hpijs/hpijs.cpp
--- hplip-3.10.5/prnt/hpijs/hpijs.cpp.bad-state-attr 2010-06-17 15:11:53.417989598 +0100
+++ hplip-3.10.5/prnt/hpijs/hpijs.cpp 2010-06-17 15:28:41.169989632 +0100
@@ -666,11 +666,11 @@ int main (int argc, char *argv[], char *
case WARN_LOW_INK_YELLOW:
case WARN_LOW_INK_MULTIPLE_PENS:
{
- BUG ("STATE: +marker-supply-low-warning\n");
+ fputs("STATE: +marker-supply-low-warning\n", stderr);
break;
}
default:
- BUG ("STATE: -marker-supply-low-warning\n");
+ fputs("STATE: -marker-supply-low-warning\n", stderr);
}
}

11
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 3.10.5 Version: 3.10.6
Release: 6%{?dist} Release: 1%{?dist}
License: GPLv2+ and MIT License: GPLv2+ and MIT
Group: System Environment/Daemons Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132 Conflicts: system-config-printer < 0.6.132
@ -25,7 +25,6 @@ Patch8: hplip-retry-open.patch
Patch10: hplip-discovery-method.patch Patch10: hplip-discovery-method.patch
Patch11: hplip-device-reconnected.patch Patch11: hplip-device-reconnected.patch
Patch12: hplip-clear-old-state-reasons.patch Patch12: hplip-clear-old-state-reasons.patch
Patch13: hplip-bad-state-attr.patch
Patch14: hplip-hpcups-sigpipe.patch Patch14: hplip-hpcups-sigpipe.patch
Patch16: hplip-bad-low-ink-warning.patch Patch16: hplip-bad-low-ink-warning.patch
Patch17: hplip-skip-blank-lines.patch Patch17: hplip-skip-blank-lines.patch
@ -160,9 +159,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
# Clear old printer-state-reasons we used to manage (bug #510926). # Clear old printer-state-reasons we used to manage (bug #510926).
%patch12 -p1 -b .clear-old-state-reasons %patch12 -p1 -b .clear-old-state-reasons
# Fixed marker-supply attributes in hpijs (bug #605269).
%patch13 -p1 -b .bad-state-attr
# Avoid busy loop in hpcups when backend has exited (bug #525944). # Avoid busy loop in hpcups when backend has exited (bug #525944).
%patch14 -p1 -b .hpcups-sigpipe %patch14 -p1 -b .hpcups-sigpipe
@ -412,6 +408,9 @@ fi
%{_bindir}/hpcups-update-ppds &>/dev/null ||: %{_bindir}/hpcups-update-ppds &>/dev/null ||:
%changelog %changelog
* Tue Jul 27 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.6-1
- 3.10.6.
* Mon Jun 24 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.5-6 * Mon Jun 24 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.5-6
- Main package requires explicit version of hplip-libs. - Main package requires explicit version of hplip-libs.

2
sources
View File

@ -1 +1 @@
a4a3679d5987520226ef70d834b63b88 hplip-3.10.5.tar.gz 96c36e3baf35e93cf9436a772f0c9ef4 hplip-3.10.6.tar.gz