|
@@ -2,8 +2,11 @@
|
|
Summary: HP printer drivers & utilities for Linux
|
|
Summary: HP printer drivers & utilities for Linux
|
|
Summary(ja): HP プリンタの Linux 向けドライバとユーティリティ
|
|
Summary(ja): HP プリンタの Linux 向けドライバとユーティリティ
|
|
Name: hplip
|
|
Name: hplip
|
|
-Version: 3.18.12
|
|
|
|
|
|
+Version: 3.20.6
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
|
|
+Vendor: Project Vine
|
|
|
|
+Distribution: Vine Linux
|
|
|
|
+Packager: kazutaka
|
|
|
|
|
|
License: GPLv2+, MIT and BSD
|
|
License: GPLv2+, MIT and BSD
|
|
Group: Applications/Publishing
|
|
Group: Applications/Publishing
|
|
@@ -13,30 +16,32 @@ Source0: http://downloads.sourceforge.net/sourceforge/hplip/hplip-%{version}.tar
|
|
#Source1: hpcups-update-ppds.sh
|
|
#Source1: hpcups-update-ppds.sh
|
|
Source2: copy-deviceids.py
|
|
Source2: copy-deviceids.py
|
|
Source3: %{name}.appdata.xml
|
|
Source3: %{name}.appdata.xml
|
|
|
|
+Source4: hp-laserjet_cp_1025nw.ppd.gz
|
|
|
|
+Source5: hp-laserjet_professional_p_1102w.ppd.gz
|
|
Source1000: hplip.desktop.vine
|
|
Source1000: hplip.desktop.vine
|
|
|
|
|
|
-Patch1: hplip-pstotiff-is-rubbish.patch
|
|
|
|
-Patch2: hplip-strstr-const.patch
|
|
|
|
-Patch3: hplip-ui-optional.patch
|
|
|
|
-Patch4: hplip-no-asm.patch
|
|
|
|
-Patch5: hplip-deviceIDs-drv.patch
|
|
|
|
-Patch6: hplip-udev-rules.patch
|
|
|
|
-Patch7: hplip-retry-open.patch
|
|
|
|
-Patch8: hplip-snmp-quirks.patch
|
|
|
|
-Patch9: hplip-hpijs-marker-supply.patch
|
|
|
|
-Patch10: hplip-clear-old-state-reasons.patch
|
|
|
|
-Patch11: hplip-hpcups-sigpipe.patch
|
|
|
|
-Patch12: hplip-logdir.patch
|
|
|
|
-Patch13: hplip-bad-low-ink-warning.patch
|
|
|
|
-Patch14: hplip-deviceIDs-ppd.patch
|
|
|
|
-Patch15: hplip-ppd-ImageableArea.patch
|
|
|
|
-Patch16: hplip-scan-tmp.patch
|
|
|
|
-Patch17: hplip-log-stderr.patch
|
|
|
|
-Patch18: hplip-avahi-parsing.patch
|
|
|
|
-Patch20: hplip-dj990c-margin.patch
|
|
|
|
-Patch21: hplip-strncpy.patch
|
|
|
|
-Patch22: hplip-no-write-bytecode.patch
|
|
|
|
-Patch23: hplip-silence-ioerror.patch
|
|
|
|
|
|
+Patch1: hplip-pstotiff-is-rubbish.patch
|
|
|
|
+Patch2: hplip-strstr-const.patch
|
|
|
|
+Patch3: hplip-ui-optional.patch
|
|
|
|
+Patch4: hplip-no-asm.patch
|
|
|
|
+Patch5: hplip-deviceIDs-drv.patch
|
|
|
|
+Patch6: hplip-udev-rules.patch
|
|
|
|
+Patch7: hplip-retry-open.patch
|
|
|
|
+Patch8: hplip-snmp-quirks.patch
|
|
|
|
+Patch9: hplip-hpijs-marker-supply.patch
|
|
|
|
+Patch10: hplip-clear-old-state-reasons.patch
|
|
|
|
+Patch11: hplip-hpcups-sigpipe.patch
|
|
|
|
+Patch12: hplip-logdir.patch
|
|
|
|
+Patch13: hplip-bad-low-ink-warning.patch
|
|
|
|
+Patch14: hplip-deviceIDs-ppd.patch
|
|
|
|
+Patch15: hplip-ppd-ImageableArea.patch
|
|
|
|
+Patch16: hplip-scan-tmp.patch
|
|
|
|
+Patch17: hplip-log-stderr.patch
|
|
|
|
+Patch18: hplip-avahi-parsing.patch
|
|
|
|
+Patch20: hplip-dj990c-margin.patch
|
|
|
|
+Patch21: hplip-strncpy.patch
|
|
|
|
+Patch22: hplip-no-write-bytecode.patch
|
|
|
|
+Patch23: hplip-silence-ioerror.patch
|
|
Patch24: hplip-3165-sourceoption.patch
|
|
Patch24: hplip-3165-sourceoption.patch
|
|
Patch25: hplip-noernie.patch
|
|
Patch25: hplip-noernie.patch
|
|
Patch26: hplip-appdata.patch
|
|
Patch26: hplip-appdata.patch
|
|
@@ -48,39 +53,30 @@ Patch30: hplip-typo.patch
|
|
# code gets fixed.
|
|
# code gets fixed.
|
|
Patch31: hplip-use-binary-str.patch
|
|
Patch31: hplip-use-binary-str.patch
|
|
# m278-m281 doesn't work correctly again
|
|
# m278-m281 doesn't work correctly again
|
|
-Patch32: hplip-colorlaserjet-mfp-m278-m281.patch
|
|
|
|
-Patch33: hplip-error-print.patch
|
|
|
|
-Patch34: hplip-hpfax-importerror-print.patch
|
|
|
|
-Patch35: hplip-wifisetup.patch
|
|
|
|
-# bz1645815, hplaunchpad1802941 - python3.7 treats StopIteration in generators
|
|
|
|
-# differently than before, now it gets propagated as other exceptions and
|
|
|
|
-# it cannot silently end the loop (as it was sometimes used) - use 'return'
|
|
|
|
-# instead of raising StopIteration exception
|
|
|
|
-Patch36: hplip-stopiteration.patch
|
|
|
|
|
|
+Patch32: hplip-error-print.patch
|
|
|
|
+Patch33: hplip-hpfax-importerror-print.patch
|
|
|
|
+Patch34: hplip-wifisetup.patch
|
|
# pgp.mit.edu keyserver got bad connection, so we need to have pool of keyservers
|
|
# pgp.mit.edu keyserver got bad connection, so we need to have pool of keyservers
|
|
# to choose (Bz#1641100, launchpad#1799212)
|
|
# to choose (Bz#1641100, launchpad#1799212)
|
|
-Patch37: hplip-keyserver.patch
|
|
|
|
|
|
+Patch35: hplip-keyserver.patch
|
|
# QMessagebox call was copy-pasted from Qt4 version, but Qt5 has different arguments,
|
|
# QMessagebox call was copy-pasted from Qt4 version, but Qt5 has different arguments,
|
|
# This patch solves most of them
|
|
# This patch solves most of them
|
|
-Patch38: 0026-Call-QMessageBox-constructors-of-PyQT5-with-the-corr.patch
|
|
|
|
|
|
+Patch36: 0026-Call-QMessageBox-constructors-of-PyQT5-with-the-corr.patch
|
|
# HP upstream introduced new binary blob, which is not open-source, so it violates
|
|
# HP upstream introduced new binary blob, which is not open-source, so it violates
|
|
# FPG by two ways - shipping binary blob and non open source code - so it needs to be removed.
|
|
# FPG by two ways - shipping binary blob and non open source code - so it needs to be removed.
|
|
# Patch is taken from Debian.
|
|
# Patch is taken from Debian.
|
|
-Patch39: 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
|
|
|
|
|
|
+Patch37: 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
|
|
# In hplip-3.18.10 some parts of UI code was commented out, which leaved hp-toolbox
|
|
# In hplip-3.18.10 some parts of UI code was commented out, which leaved hp-toolbox
|
|
# unusable (crashed on the start). The patch removes usages of variables, which were
|
|
# unusable (crashed on the start). The patch removes usages of variables, which were
|
|
# commented out.
|
|
# commented out.
|
|
# The patch is taken from Debian.
|
|
# The patch is taken from Debian.
|
|
-Patch40: 0027-Fixed-incomplete-removal-of-hp-toolbox-features-whic.patch
|
|
|
|
-# New tool - hp-uiscan - misses support of -h argument and crashes with traceback
|
|
|
|
-# Reported as https://bugs.launchpad.net/hplip/+bug/1810943
|
|
|
|
-Patch41: hplip-uiscan-help.patch
|
|
|
|
|
|
+Patch38: 0027-Fixed-incomplete-removal-of-hp-toolbox-features-whic.patch
|
|
# hp-setup crashed when user wanted to define a path to PPD file. It was due
|
|
# hp-setup crashed when user wanted to define a path to PPD file. It was due
|
|
# byte + string variables incompatibility and it is fixed by decoding the
|
|
# byte + string variables incompatibility and it is fixed by decoding the
|
|
# bytes-like variable
|
|
# bytes-like variable
|
|
# part of https://bugzilla.redhat.com/show_bug.cgi?id=1666076
|
|
# part of https://bugzilla.redhat.com/show_bug.cgi?id=1666076
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1814272
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1814272
|
|
-Patch42: hplip-add-ppd-crash.patch
|
|
|
|
|
|
+Patch39: hplip-add-ppd-crash.patch
|
|
# external scripts, which are downloaded and run by hp-plugin, try to create links
|
|
# external scripts, which are downloaded and run by hp-plugin, try to create links
|
|
# in non-existing dirs. These scripts ignore errors, so plugin is installed fine
|
|
# in non-existing dirs. These scripts ignore errors, so plugin is installed fine
|
|
# but then internal hp-plugin can check for plugin state, where links are checked too.
|
|
# but then internal hp-plugin can check for plugin state, where links are checked too.
|
|
@@ -89,28 +85,85 @@ Patch42: hplip-add-ppd-crash.patch
|
|
# because their external scripts try to create links in non-existing dirs.
|
|
# because their external scripts try to create links in non-existing dirs.
|
|
# Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1671513
|
|
# Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1671513
|
|
# Reported upstream: https://bugs.launchpad.net/hplip/+bug/1814574
|
|
# Reported upstream: https://bugs.launchpad.net/hplip/+bug/1814574
|
|
-Patch43: hplip-missing-links.patch
|
|
|
|
|
|
+Patch40: hplip-missing-links.patch
|
|
# change in 3.18.9 in scanext.c caused broken scanning for HP LaserJet 3052. Since I cannot figure
|
|
# change in 3.18.9 in scanext.c caused broken scanning for HP LaserJet 3052. Since I cannot figure
|
|
# it out what author wanted by the change (it sets option number 9 to true, but different handles
|
|
# it out what author wanted by the change (it sets option number 9 to true, but different handles
|
|
# have different options, so I'm not sure what author wanted to set).
|
|
# have different options, so I'm not sure what author wanted to set).
|
|
# Remove the change for now, it works for user and me.
|
|
# Remove the change for now, it works for user and me.
|
|
-Patch44: hplip-hplj-3052.patch
|
|
|
|
|
|
+Patch41: hplip-hplj-3052.patch
|
|
# hpmud parses mdns txt record badly
|
|
# hpmud parses mdns txt record badly
|
|
# upstream tickets: https://bugs.launchpad.net/hplip/+bug/1797501
|
|
# upstream tickets: https://bugs.launchpad.net/hplip/+bug/1797501
|
|
# https://bugs.launchpad.net/hplip/+bug/1817214
|
|
# https://bugs.launchpad.net/hplip/+bug/1817214
|
|
# https://bugs.launchpad.net/hplip/+bug/1821932
|
|
# https://bugs.launchpad.net/hplip/+bug/1821932
|
|
# with no response from upstream
|
|
# with no response from upstream
|
|
# Patch taken from Debian https://lists.debian.org/debian-printing/2018/11/msg00049.html
|
|
# Patch taken from Debian https://lists.debian.org/debian-printing/2018/11/msg00049.html
|
|
-Patch45: hplip-hpmud-string-parse.patch
|
|
|
|
|
|
+Patch42: hplip-hpmud-string-parse.patch
|
|
# Part of https://bugzilla.redhat.com/show_bug.cgi?id=1694663
|
|
# Part of https://bugzilla.redhat.com/show_bug.cgi?id=1694663
|
|
# It was found out that specific device needs plugin for scanning
|
|
# It was found out that specific device needs plugin for scanning
|
|
# Reported upstream as https://bugs.launchpad.net/hplip/+bug/1822762
|
|
# Reported upstream as https://bugs.launchpad.net/hplip/+bug/1822762
|
|
-Patch46: hplip-m278-m281-needs-plugin.patch
|
|
|
|
|
|
+Patch43: hplip-m278-m281-needs-plugin.patch
|
|
# hpcups crashes when a printer needs a plugin and does not have one installed
|
|
# hpcups crashes when a printer needs a plugin and does not have one installed
|
|
# it crashes in destructor, because pointer is not initialized
|
|
# it crashes in destructor, because pointer is not initialized
|
|
# bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1695716
|
|
# bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1695716
|
|
# reported upstream
|
|
# reported upstream
|
|
-Patch47: hplip-hpcups-crash.patch
|
|
|
|
|
|
+Patch44: hplip-hpcups-crash.patch
|
|
|
|
+# Fixing the issues found by coverity scan
|
|
|
|
+# reported upstream https://bugs.launchpad.net/hplip/+bug/1808145
|
|
|
|
+Patch45: hplip-covscan.patch
|
|
|
|
+# Segfault during logging to syslog because argument are switched
|
|
|
|
+# bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1727162
|
|
|
|
+# upstream https://bugs.launchpad.net/hplip/+bug/1837846
|
|
|
|
+Patch46: hplip-logging-segfault.patch
|
|
|
|
+# Traceback in hp-systray when there are no resource
|
|
|
|
+# wanted to report upstream, but launchpad ends with timeout error
|
|
|
|
+# bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1738321
|
|
|
|
+Patch47: hplip-systray-blockerror.patch
|
|
|
|
+# several printers were removed in 3.19.1, but actually someone still uses them
|
|
|
|
+# reported upstream https://bugs.launchpad.net/hplip/+bug/1843592
|
|
|
|
+# bugzillas 1742949, 1740132, 1739855
|
|
|
|
+Patch48: hplip-missing-drivers.patch
|
|
|
|
+# laserjet 2200 and other devices have different device id than HP expects...
|
|
|
|
+# https://bugzilla.redhat.com/show_bug.cgi?id=1772698
|
|
|
|
+# reported upstream https://bugs.launchpad.net/hplip/+bug/1853002
|
|
|
|
+Patch49: hplip-model-mismatch.patch
|
|
|
|
+# sixext has problems with python3 strings (bz#1573430)
|
|
|
|
+# reported https://bugs.launchpad.net/bugs/1480152
|
|
|
|
+Patch50: hplip-unicodeerror.patch
|
|
|
|
+# error with new gcc, already reported in upstream as
|
|
|
|
+# https://bugs.launchpad.net/hplip/+bug/1836735
|
|
|
|
+Patch51: hplip-fix-Wreturn-type-warning.patch
|
|
|
|
+# upstream check for python clears OS build system
|
|
|
|
+# CFLAGS
|
|
|
|
+# https://bugs.launchpad.net/hplip/+bug/1879445
|
|
|
|
+Patch52: hplip-configure-python.patch
|
|
|
|
+# taken from hplip upstream report - toolbox uses deprecated method
|
|
|
|
+# setMargin(), which generates an exception, resulting in a infinite loop
|
|
|
|
+# of request on cupsd
|
|
|
|
+# https://bugs.launchpad.net/hplip/+bug/1880275
|
|
|
|
+Patch53: hplip-dialog-infinite-loop.patch
|
|
|
|
+# searching algorithm did not expect '-' in model name and thought it is a new PDL
|
|
|
|
+# it resulted in incorrect PPD match, so e.g. hpijs driver was used instead of hpcups
|
|
|
|
+# bug: https://bugzilla.redhat.com/show_bug.cgi?id=1590014
|
|
|
|
+# reported upstream: https://bugs.launchpad.net/hplip/+bug/1881587
|
|
|
|
+Patch54: hplip-find-driver.patch
|
|
|
|
+# hp-clean didn't work for Photosmart C1410 because it was comparing
|
|
|
|
+# string length with buffer size for string object, which is different,
|
|
|
|
+# causing cleaning to fail - the fix is to make the object bytes-like,
|
|
|
|
+# then buffer size is the same as the length.
|
|
|
|
+# Thanks to Stefan Assmann we were able to fix level 1 cleaning
|
|
|
|
+# for the device, but there can be similar issues with other devices
|
|
|
|
+# bug https://bugzilla.redhat.com/show_bug.cgi?id=1833308
|
|
|
|
+# reported upstream https://bugs.launchpad.net/hplip/+bug/1882193
|
|
|
|
+Patch55: hplip-clean-ldl.patch
|
|
|
|
+# 3.20.6 turned off requirement for most devices which needed it
|
|
|
|
+# - it will cause malfunction of printing and scanning for them
|
|
|
|
+# https://bugs.launchpad.net/hplip/+bug/1883898
|
|
|
|
+Patch56: hplip-revert-plugins.patch
|
|
|
|
+# python3.9 removes threading.Thread.isAlive() and it is substituted
|
|
|
|
+# by threading.Thread.is_alive()
|
|
|
|
+# https://bugzilla.redhat.com/show_bug.cgi?id=1861055
|
|
|
|
+# reported upstream https://bugs.launchpad.net/fedora/+bug/1889280
|
|
|
|
+Patch57: hplip-thread-isalive-removed.patch
|
|
|
|
|
|
# Vine Patches
|
|
# Vine Patches
|
|
Patch70: hplip-3.11.5-gksu.patch
|
|
Patch70: hplip-3.11.5-gksu.patch
|
|
@@ -136,6 +189,8 @@ BuildRequires: python3-rpm-macros
|
|
BuildRequires: python3-cups, cups
|
|
BuildRequires: python3-cups, cups
|
|
BuildRequires: sane-devel
|
|
BuildRequires: sane-devel
|
|
BuildRequires: python3-qt5
|
|
BuildRequires: python3-qt5
|
|
|
|
+BuildRequires: libappstream-glib
|
|
|
|
+BuildRequires: gsettings-desktop-schemas
|
|
# to force to use Qt5
|
|
# to force to use Qt5
|
|
BuildConflicts: PyQt
|
|
BuildConflicts: PyQt
|
|
BuildConflicts: PyQt4
|
|
BuildConflicts: PyQt4
|
|
@@ -143,11 +198,6 @@ BuildConflicts: PyQt4
|
|
Provides: hpijs = %{version}-%{release}
|
|
Provides: hpijs = %{version}-%{release}
|
|
Obsoletes: hpijs < %{version}-%{release}
|
|
Obsoletes: hpijs < %{version}-%{release}
|
|
|
|
|
|
-
|
|
|
|
-Vendor: Project Vine
|
|
|
|
-Distribution: Vine Linux
|
|
|
|
-Packager: kazutaka
|
|
|
|
-
|
|
|
|
%description
|
|
%description
|
|
The Hewlett-Packard Linux Imaging and Printing Project provides
|
|
The Hewlett-Packard Linux Imaging and Printing Project provides
|
|
drivers for HP printers and multi-function peripherals.
|
|
drivers for HP printers and multi-function peripherals.
|
|
@@ -331,53 +381,72 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
|
|
%patch30 -p1 -b .typo
|
|
%patch30 -p1 -b .typo
|
|
|
|
|
|
%patch31 -p1 -b .use-binary-str
|
|
%patch31 -p1 -b .use-binary-str
|
|
-%patch32 -p1 -b .colorlaserjet-mfp-m278-m281
|
|
|
|
|
|
|
|
# TypeError: 'Error' object does not support indexing (bug #1564770)
|
|
# TypeError: 'Error' object does not support indexing (bug #1564770)
|
|
# upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1718129
|
|
# upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1718129
|
|
# in python2 it was possible to acces Exception message by index [0].
|
|
# in python2 it was possible to acces Exception message by index [0].
|
|
# in python3 this is no longer possible and it causes TypeError.
|
|
# in python3 this is no longer possible and it causes TypeError.
|
|
-%patch33 -p1 -b .error-print-fix
|
|
|
|
|
|
+%patch32 -p1 -b .error-print-fix
|
|
|
|
|
|
# TypeError: not all arguments converted during string formatting (bug #1566938)
|
|
# TypeError: not all arguments converted during string formatting (bug #1566938)
|
|
# upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/616450
|
|
# upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/616450
|
|
# bug caused by more arguments than argument specifiers in formatted string
|
|
# bug caused by more arguments than argument specifiers in formatted string
|
|
-%patch34 -p1 -b .hpfax-import-error-print
|
|
|
|
|
|
+%patch33 -p1 -b .hpfax-import-error-print
|
|
|
|
|
|
# 'WifiSetupDialog' object has no attribute 'wifiobj' (bug #1626877)
|
|
# 'WifiSetupDialog' object has no attribute 'wifiobj' (bug #1626877)
|
|
# upstream bug: https://bugs.launchpad.net/hplip/+bug/1752060
|
|
# upstream bug: https://bugs.launchpad.net/hplip/+bug/1752060
|
|
# bug caused by typo in wifisetupdialog wifiObj property call
|
|
# bug caused by typo in wifisetupdialog wifiObj property call
|
|
-%patch35 -p1 -b .wifisetup-bad-call-fix
|
|
|
|
-
|
|
|
|
-# 1645815 - hp-check --runtime crashes involving FileNotFoundError
|
|
|
|
-%patch36 -p1 -b .stopiteration
|
|
|
|
|
|
+%patch34 -p1 -b .wifisetup-bad-call-fix
|
|
|
|
|
|
# have pool of keyservers to choose
|
|
# have pool of keyservers to choose
|
|
-%patch37 -p1 -b .keyserver
|
|
|
|
|
|
+%patch35 -p1 -b .keyserver
|
|
|
|
|
|
# TypeError: argument 5 has unexpected type 'StandardButtons' (bug #1594602)
|
|
# TypeError: argument 5 has unexpected type 'StandardButtons' (bug #1594602)
|
|
# upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1745383
|
|
# upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1745383
|
|
# bug caused by typo in QMessageBox constructor call
|
|
# bug caused by typo in QMessageBox constructor call
|
|
# this patch fixes more of those typos - some fixed by tkorbar, some taken from ubuntu fix
|
|
# this patch fixes more of those typos - some fixed by tkorbar, some taken from ubuntu fix
|
|
-%patch38 -p1 -b .qmsgbox-typos-fix
|
|
|
|
-%patch39 -p1 -b .libimageprocessor-removal
|
|
|
|
|
|
+%patch36 -p1 -b .qmsgbox-typos-fix
|
|
|
|
+
|
|
|
|
+# removal of non open source code, taken from ubuntu
|
|
|
|
+%patch37 -p1 -b .libimageprocessor-removal
|
|
|
|
|
|
-rm prnt/hpcups/libImageProcessor-x86*
|
|
|
|
|
|
+%__rm prnt/hpcups/libImageProcessor-x86*
|
|
|
|
|
|
-%patch40 -p1 -b .toolbox-crash
|
|
|
|
-%patch41 -p1 -b .uiscan-help
|
|
|
|
|
|
+%patch38 -p1 -b .toolbox-crash
|
|
# part of https://bugzilla.redhat.com/show_bug.cgi?id=1666076
|
|
# part of https://bugzilla.redhat.com/show_bug.cgi?id=1666076
|
|
-%patch42 -p1 -b .add-ppd-crash
|
|
|
|
|
|
+%patch39 -p1 -b .add-ppd-crash
|
|
# 1671513 - after 'successful' plugin installation it is not installed
|
|
# 1671513 - after 'successful' plugin installation it is not installed
|
|
-%patch43 -p1 -b .missing-links
|
|
|
|
|
|
+%patch40 -p1 -b .missing-links
|
|
# 1684434 - Scanning broken for HP LaserJet 3052
|
|
# 1684434 - Scanning broken for HP LaserJet 3052
|
|
-%patch44 -p1 -b .hp-laserjet-3052-broken-scanning
|
|
|
|
|
|
+%patch41 -p1 -b .hp-laserjet-3052-broken-scanning
|
|
# 1694663 - Cannot scan with M281fdw LaserJet - failed: Error during device I/O (part 1)
|
|
# 1694663 - Cannot scan with M281fdw LaserJet - failed: Error during device I/O (part 1)
|
|
-%patch45 -p1 -b .hpmud-string-parse
|
|
|
|
|
|
+%patch42 -p1 -b .hpmud-string-parse
|
|
# 1694663 - Cannot scan with M281fdw LaserJet - failed: Error during device I/O (part 2)
|
|
# 1694663 - Cannot scan with M281fdw LaserJet - failed: Error during device I/O (part 2)
|
|
-%patch46 -p1 -b .m278-m281-needs-plugin
|
|
|
|
|
|
+%patch43 -p1 -b .m278-m281-needs-plugin
|
|
# 1695716 - hpcups crashes in Compressor destructor
|
|
# 1695716 - hpcups crashes in Compressor destructor
|
|
-%patch47 -p1 -b .hpcups-crash
|
|
|
|
|
|
+%patch44 -p1 -b .hpcups-crash
|
|
|
|
+# fixing issues found by coverity scan
|
|
|
|
+%patch45 -p1 -b .covscan
|
|
|
|
+# segfault during logging (1727162)
|
|
|
|
+%patch46 -p1 -b .logging-segfault
|
|
|
|
+# 1738321 - [abrt] hp-systray:BlockingIOError: [Errno 11] Resource temporarily unavailable
|
|
|
|
+%patch47 -p1 -b .systray-blockerror
|
|
|
|
+# 1742949, 1740132, 1739855 - missing drivers
|
|
|
|
+%patch48 -p1 -b .missing-drivers
|
|
|
|
+# 1772698 - Can't setup printer (HP LJ 2200): no attributes found in model.dat
|
|
|
|
+%patch49 -p1 -b .model-mismatch
|
|
|
|
+# 1573430 - sixext.py:to_string_utf8:UnicodeDecodeError: 'utf-8' codec can't decode bytes
|
|
|
|
+%patch50 -p1 -b .unicodeerror
|
|
|
|
+%patch51 -p1 -b .Wreturn-fix
|
|
|
|
+%patch52 -p1 -b .configure-python
|
|
|
|
+%patch53 -p1 -b .dialog-infinite-loop
|
|
|
|
+# 1590014 - hplip PPD search doesn't expect '-' in device name
|
|
|
|
+%patch54 -p1 -b .find-driver
|
|
|
|
+# 1833308 - hp-clean cannot clean HP PSC1410 - Device I/O error
|
|
|
|
+%patch55 -p1 -b .clean-ldl
|
|
|
|
+%patch56 -p1 -b .revert-plugins
|
|
|
|
+# 1861055 - hplip: remove threading.Thread.isAlive method calls - use threading.Thread.is_alive()
|
|
|
|
+%patch57 -p1 -b .thread-isalive-removed
|
|
|
|
|
|
# vine
|
|
# vine
|
|
|
|
|
|
@@ -397,9 +466,14 @@ sed -i.env-python -e 's,^#!/usr/bin/env python,#!%{__python3},' \
|
|
|
|
|
|
rm locatedriver
|
|
rm locatedriver
|
|
|
|
|
|
|
|
+cp -p %{SOURCE4} %{SOURCE5} ppd/hpcups
|
|
|
|
+
|
|
|
|
+
|
|
%build
|
|
%build
|
|
|
|
+# Work-around Makefile.am imperfections.
|
|
|
|
+sed -i 's|^AM_INIT_AUTOMAKE|AM_INIT_AUTOMAKE([foreign])|g' configure.in
|
|
touch NEWS README AUTHORS ChangeLog
|
|
touch NEWS README AUTHORS ChangeLog
|
|
-autoreconf -f -i
|
|
|
|
|
|
+autoreconf -fiv
|
|
%configure \
|
|
%configure \
|
|
--enable-scan-build --enable-gui-build --enable-fax-build \
|
|
--enable-scan-build --enable-gui-build --enable-fax-build \
|
|
--disable-foomatic-rip-hplip-install --enable-pp-build \
|
|
--disable-foomatic-rip-hplip-install --enable-pp-build \
|
|
@@ -414,16 +488,12 @@ autoreconf -f -i
|
|
--with-hpppddir=%{_datadir}/foomatic/db/source/PPD/HP \
|
|
--with-hpppddir=%{_datadir}/foomatic/db/source/PPD/HP \
|
|
PYTHON=%{__python3}
|
|
PYTHON=%{__python3}
|
|
|
|
|
|
-
|
|
|
|
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
|
|
|
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
|
|
|
-
|
|
|
|
make %{?_smp_mflags}
|
|
make %{?_smp_mflags}
|
|
|
|
|
|
|
|
|
|
%install
|
|
%install
|
|
rm -rf $RPM_BUILD_ROOT
|
|
rm -rf $RPM_BUILD_ROOT
|
|
-make install DESTDIR=$RPM_BUILD_ROOT rulesdir=/lib/udev/rules.d
|
|
|
|
|
|
+make install DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python3} rulesdir=/lib/udev/rules.d
|
|
|
|
|
|
# Create /run/hplip & /var/lib/hp
|
|
# Create /run/hplip & /var/lib/hp
|
|
mkdir -p $RPM_BUILD_ROOT/run/hplip
|
|
mkdir -p $RPM_BUILD_ROOT/run/hplip
|
|
@@ -468,8 +538,8 @@ rm -f %{buildroot}%{_bindir}/foomatic-rip \
|
|
%{buildroot}%{_datadir}/applications/hplip.desktop \
|
|
%{buildroot}%{_datadir}/applications/hplip.desktop \
|
|
%{buildroot}%{_datadir}/ppd/HP/*.ppd
|
|
%{buildroot}%{_datadir}/ppd/HP/*.ppd
|
|
|
|
|
|
-mkdir -p %{buildroot}%{_datadir}/appdata
|
|
|
|
-cp %{SOURCE3} %{buildroot}%{_datadir}/appdata/
|
|
|
|
|
|
+mkdir -p %{buildroot}%{_datadir}/metainfo
|
|
|
|
+cp %{SOURCE3} %{buildroot}%{_datadir}/metainfo/
|
|
|
|
|
|
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,64x64}/apps
|
|
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,64x64}/apps
|
|
install -p -m644 %{buildroot}%{_datadir}/hplip/data/images/16x16/hp_logo.png \
|
|
install -p -m644 %{buildroot}%{_datadir}/hplip/data/images/16x16/hp_logo.png \
|
|
@@ -479,18 +549,24 @@ install -p -m644 %{buildroot}%{_datadir}/hplip/data/images/32x32/hp_logo.png \
|
|
install -p -m644 %{buildroot}%{_datadir}/hplip/data/images/64x64/hp_logo.png \
|
|
install -p -m644 %{buildroot}%{_datadir}/hplip/data/images/64x64/hp_logo.png \
|
|
%{buildroot}%{_datadir}/icons/hicolor/64x64/apps/hp_logo.png
|
|
%{buildroot}%{_datadir}/icons/hicolor/64x64/apps/hp_logo.png
|
|
|
|
|
|
-cp -p %{SOURCE1000} hplip.desktop
|
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
|
|
|
|
|
|
+mkdir -p %{buildroot}%{_datadir}/applications
|
|
sed -i -e '/^Categories=/d' hplip.desktop
|
|
sed -i -e '/^Categories=/d' hplip.desktop
|
|
# Encoding key is deprecated
|
|
# Encoding key is deprecated
|
|
sed -i -e '/^Encoding=/d' hplip.desktop
|
|
sed -i -e '/^Encoding=/d' hplip.desktop
|
|
-desktop-file-install --vendor "HP" \
|
|
|
|
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
|
|
|
|
- --add-category System \
|
|
|
|
- --add-category Settings \
|
|
|
|
- --add-category HardwareSettings \
|
|
|
|
|
|
+desktop-file-validate hplip.desktop
|
|
|
|
+
|
|
|
|
+desktop-file-install \
|
|
|
|
+ --dir %{buildroot}/%{_datadir}/applications \
|
|
|
|
+ --add-category System \
|
|
|
|
+ --add-category Settings \
|
|
|
|
+ --add-category HardwareSettings \
|
|
hplip.desktop
|
|
hplip.desktop
|
|
|
|
|
|
|
|
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
|
|
|
|
+
|
|
|
|
+# install hp-uiscan desktop file
|
|
|
|
+sed -i 's/\/usr\/share\/icons\/Humanity\/devices\/48\/printer\.svg/hp_logo/' hp-uiscan.desktop
|
|
|
|
+
|
|
# Regenerate hpcups PPDs on upgrade if necessary (bug #579355).
|
|
# Regenerate hpcups PPDs on upgrade if necessary (bug #579355).
|
|
#install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/hpcups-update-ppds
|
|
#install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/hpcups-update-ppds
|
|
|
|
|
|
@@ -530,9 +606,9 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
|
%post libs -p /sbin/ldconfig
|
|
%post libs -p /sbin/ldconfig
|
|
-
|
|
|
|
%postun libs -p /sbin/ldconfig
|
|
%postun libs -p /sbin/ldconfig
|
|
|
|
|
|
|
|
+
|
|
%files
|
|
%files
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
%doc COPYING doc/*
|
|
%doc COPYING doc/*
|
|
@@ -652,7 +728,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
%{_bindir}/hp-toolbox
|
|
%{_bindir}/hp-toolbox
|
|
%{_bindir}/hp-uiscan
|
|
%{_bindir}/hp-uiscan
|
|
%{_datadir}/applications/*.desktop
|
|
%{_datadir}/applications/*.desktop
|
|
-%{_datadir}/appdata/hplip.appdata.xml
|
|
|
|
|
|
+%{_datadir}/metainfo/hplip.appdata.xml
|
|
# Files
|
|
# Files
|
|
%{_datadir}/icons/hicolor/*/apps/*
|
|
%{_datadir}/icons/hicolor/*/apps/*
|
|
%{_datadir}/hplip/check.py*
|
|
%{_datadir}/hplip/check.py*
|