This commit is contained in:
Zdenek Dohnal 2018-03-12 16:13:24 +01:00
parent fd8a6ab9ed
commit dcb6e8f599
5 changed files with 15 additions and 25 deletions

1
.gitignore vendored
View File

@ -85,3 +85,4 @@ hplip-3.10.6.tar.gz
/hplip-3.17.9.tar.gz
/hplip-3.17.10.tar.gz
/hplip-3.17.11.tar.gz
/hplip-3.18.3.tar.gz

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

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAlqeZhwACgkQc9dwzaWQR7miTQCdF1mnStRSshUVtqUdL0HFbWFI
2pMAoNLy6A6v7d1+nn31Dit5eD4nvSy6
=JNFd
-----END PGP SIGNATURE-----

View File

@ -1,17 +0,0 @@
diff -up hplip-3.17.11/scan.py.jpeg-compression hplip-3.17.11/scan.py
--- hplip-3.17.11/scan.py.jpeg-compression 2018-01-08 09:26:42.547072815 +0100
+++ hplip-3.17.11/scan.py 2018-01-08 09:29:39.753604411 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
#
# (c) Copyright 2003-2015 HP Development Company, L.P.
@@ -1079,6 +1079,7 @@ try:
log.info("Saving to file %s" % output)
try:
+ im = im.convert("RGB")
im.save(output)
except IOError as e:
log.error("Error saving file: %s (I/O)" % e)

View File

@ -6,8 +6,8 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.17.11
Release: 10%{?dist}
Version: 3.18.3
Release: 1%{?dist}
License: GPLv2+ and MIT and BSD
Url: https://developers.hp.com/hp-linux-imaging-and-printing
@ -42,7 +42,6 @@ Patch25: hplip-noernie.patch
Patch26: hplip-appdata.patch
Patch27: hplip-check-cups.patch
Patch28: hplip-colorlaserjet-mfp-m278-m281.patch
Patch29: hplip-jpeg-compression.patch
Patch30: hplip-typo.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@ -242,9 +241,6 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
# Add support for HP ColorLaserjet MFP M278-M281 (bug #1509394)
%patch28 -p1 -b .colorlaserjet-mfp-m278-m281
# Unable to scan and save jpg with color with hp-scan (bug #1528851)
%patch29 -p1 -b .jpeg-compression
# hp-firmware:NameError: name 'INTERACTIVE_MODE4' is not defined (bug #1533869)
%patch30 -p1 -b .typo
@ -259,7 +255,7 @@ sed -i.env-python -e 's,^#!/usr/bin/env python,#!%{__python3},' \
prnt/filters/hpps \
fax/filters/pstotiff
rm hpps hpcups dat2drv
rm locatedriver
%build
# Work-around Makefile.am imperfections.
@ -527,6 +523,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig
%changelog
* Mon Mar 12 2018 Zdenek Dohnal <zdohnal@redhat.com> - 3.18.3-1
- 3.18.3
* Wed Feb 28 2018 Zdenek Dohnal <zdohnal@redhat.com> - 3.17.11-10
- name libraries explicitly

View File

@ -1 +1 @@
SHA512 (hplip-3.17.11.tar.gz) = 29899d58959d49a0b5e730520ef598f245570b084db33d322859b4773a934167387893888a5829c5cfd5a2e4b66848b173fc7c60973fccdb6d3f854105ad7665
SHA512 (hplip-3.18.3.tar.gz) = cb51e357cc9def3c087231b01752941b469e5fc4508ec83c6f5875352694249ef72339f2f20c4a6831c49ace7c1f6b902cc11a961c0e1f43ce098b2bf800728f