Accepting request 723252 from home:weberho:branches:Printing
updated to 3.19.6: Added support for new Printers OBS-URL: https://build.opensuse.org/request/show/723252 OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=174
This commit is contained in:
Martin Wilck
Git OBS Bridge
parent
32d17d0d9b
commit
bdd091a4b0
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a04edf0b5b4c4dcaa3998a27caad8f24513340e0aea61b694397c7807d7c2ae6
|
||||
size 25068895
|
||||
@ -1,7 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.11 (GNU/Linux)
|
||||
|
||||
iEYEABECAAYFAlyKH9EACgkQc9dwzaWQR7nNuwCfecIiWNoTvKG8iAf7UAWBjBnd
|
||||
3iAAnAjvUG0Cl2S6mZrKGt3gq+rBkVbK
|
||||
=UaiL
|
||||
-----END PGP SIGNATURE-----
|
||||
3
hplip-3.19.6.tar.gz
Normal file
3
hplip-3.19.6.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fcdaedee9ed17d2e70f3aff9558a452d99443d1b93d6623132faf3f3ae61d66d
|
||||
size 25436373
|
||||
7
hplip-3.19.6.tar.gz.asc
Normal file
7
hplip-3.19.6.tar.gz.asc
Normal file
@ -0,0 +1,7 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.11 (GNU/Linux)
|
||||
|
||||
iEYEABECAAYFAl0TbqMACgkQc9dwzaWQR7l/4gCgikXaq5OW/cKuXKhwF9wwxXqi
|
||||
0oYAnRpB1dYfi9H5hgT/j7H3PIb485UO
|
||||
=xn/+
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,85 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 12 12:53:35 UTC 2019 - Johannes Weberhofer <jweberhofer@weberhofer.at>
|
||||
|
||||
- updated to 3.19.6
|
||||
Added support for the following new Printers:
|
||||
* HP Color LaserJet Enterprise M751dn
|
||||
* HP Color LaserJet Enterprise M751n
|
||||
* HP Color LaserJet Managed E75245dn
|
||||
* HP Color LaserJet Pro M453cdn
|
||||
* HP Color LaserJet Pro M453cdw
|
||||
* HP Color LaserJet Pro M454cdn
|
||||
* HP Color LaserJet Pro M454cdw
|
||||
* HP Color LaserJet Pro M454dn
|
||||
* HP Color LaserJet Pro M454dw
|
||||
* HP Color LaserJet Pro M454nw
|
||||
* HP Color LaserJet Pro MFP M478fcdn
|
||||
* HP Color LaserJet Pro MFP M478fcdw
|
||||
* HP Color LaserJet Pro MFP M479dw
|
||||
* HP Color LaserJet Pro MFP M479fcdn
|
||||
* HP Color LaserJet Pro MFP M479fcdw
|
||||
* HP Color LaserJet Pro MFP M479fdn
|
||||
* HP Color LaserJet Pro MFP M479fdw
|
||||
* HP Color LaserJet Pro MFP M479fnw
|
||||
* HP DesignJet T2600dr Postscript MFP
|
||||
* HP DesignJet XL 3600 PS MFP
|
||||
* HP Laser NS 1020
|
||||
* HP Laser NS 1020w
|
||||
* HP Laser NS MFP 1005
|
||||
* HP Laser NS MFP 1005w
|
||||
* HP LaserJet Enterprise Flow MFP M528c
|
||||
* HP LaserJet Enterprise Flow MFP M528z
|
||||
* HP LaserJet Enterprise M507dn
|
||||
* HP LaserJet Enterprise M507dng
|
||||
* HP LaserJet Enterprise M507n
|
||||
* HP LaserJet Enterprise M507x
|
||||
* HP LaserJet Enterprise MFP M528dn
|
||||
* HP LaserJet Enterprise MFP M528f
|
||||
* HP LaserJet Managed E50145dn
|
||||
* HP LaserJet Managed E50145x
|
||||
* HP LaserJet Managed Flow MFP E52645c
|
||||
* HP LaserJet Managed MFP E52645dn
|
||||
* HP LaserJet Pro M404c1
|
||||
* HP LaserJet Pro M404c2
|
||||
* HP LaserJet Pro M404c3
|
||||
* HP LaserJet Pro M404c4
|
||||
* HP LaserJet Pro M404d
|
||||
* HP LaserJet Pro M404dn
|
||||
* HP LaserJet Pro M404dw
|
||||
* HP LaserJet Pro M404m
|
||||
* HP LaserJet Pro M404n
|
||||
* HP LaserJet Pro M405d
|
||||
* HP LaserJet Pro M405dn
|
||||
* HP LaserJet Pro M405dw
|
||||
* HP LaserJet Pro M405n
|
||||
* HP LaserJet Pro MFP M428c1
|
||||
* HP LaserJet Pro MFP M428c2
|
||||
* HP LaserJet Pro MFP M428c3
|
||||
* HP LaserJet Pro MFP M428c4
|
||||
* HP LaserJet Pro MFP M428dw
|
||||
* HP LaserJet Pro MFP M428fdn
|
||||
* HP LaserJet Pro MFP M428fdw
|
||||
* HP LaserJet Pro MFP M428m
|
||||
* HP LaserJet Pro MFP M429dw
|
||||
* HP LaserJet Pro MFP M429fdn
|
||||
* HP LaserJet Pro MFP M429fdw
|
||||
* HP Neverstop Laser 1000a
|
||||
* HP Neverstop Laser 1000w
|
||||
* HP Neverstop Laser MFP 1200a
|
||||
* HP Neverstop Laser MFP 1200w
|
||||
* HP OfficeJet 8010 All * in * One Printer series
|
||||
* HP OfficeJet 8020 All * in * One Printer Series
|
||||
* HP OfficeJet Pro 8020 All * in * One Printer series
|
||||
* HP OfficeJet Pro 8030 All * in * One Printer series
|
||||
* HP PageWide XL 3900PS MFP
|
||||
* HP Smart Tank 500 series
|
||||
* HP Smart Tank 510
|
||||
* HP Smart Tank 530 series
|
||||
* HP Smart Tank 610
|
||||
* HP Smart Tank Plus 550
|
||||
* HP Smart Tank Plus 570 series
|
||||
* HP Smart Tank Plus 650
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 16 07:52:48 UTC 2019 - Martin Liška <mliska@suse.cz>
|
||||
|
||||
|
||||
114
hplip.spec
114
hplip.spec
@ -16,20 +16,19 @@
|
||||
#
|
||||
|
||||
|
||||
%if 0%{suse_version} >= 1500
|
||||
%if 0%{?suse_version} >= 1500
|
||||
%define pyversion 3
|
||||
%define pymod() python3-%{**}
|
||||
%define pyver %py3_ver
|
||||
%define pyexe /usr/bin/python3
|
||||
%define pyexe %{_bindir}/python3
|
||||
%define gobject gobject
|
||||
%else
|
||||
%define pyversion 2
|
||||
%define pymod() python-%{**}
|
||||
%define pyver %py_ver
|
||||
%define pyexe /usr/bin/python
|
||||
%define pyexe %{_bindir}/python
|
||||
%define gobject gobject2
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} == 1315 && 0%{?is_opensuse}
|
||||
%define is_leap 1
|
||||
%else
|
||||
@ -52,14 +51,13 @@ BuildRequires: systemd-rpm-macros
|
||||
%else
|
||||
%global use_qt5 0
|
||||
%endif
|
||||
|
||||
Name: hplip
|
||||
Version: 3.19.3
|
||||
Version: 3.19.6
|
||||
Release: 0
|
||||
Summary: HP's Printing, Scanning, and Faxing Software
|
||||
License: BSD-3-Clause AND GPL-2.0-or-later AND MIT
|
||||
Group: Hardware/Printing
|
||||
Url: https://developers.hp.com/hp-linux-imaging-and-printing
|
||||
URL: https://developers.hp.com/hp-linux-imaging-and-printing
|
||||
# Source0...Source9 is for sources from HP:
|
||||
# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.15.9.tar.gz
|
||||
# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.15.9.tar.gz.asc
|
||||
@ -103,7 +101,14 @@ Patch303: photocard-fix-import-error-for-pcardext.patch
|
||||
Patch400: hplip-remove-imageprocessor.diff
|
||||
# Let a function return NULL instead of nothing
|
||||
Patch401: hplip-orblite-return-null.diff
|
||||
|
||||
# BuildRequires: python-rpm-macros
|
||||
# All printer driver packages should have "BuildRequires: python-cups"
|
||||
# because python-cups installs special rpm macros that adds Provides tags
|
||||
# for the printer drivers supported by the package,
|
||||
# see https://bugzilla.novell.com/show_bug.cgi?id=735865
|
||||
BuildRequires: %{pymod cups}
|
||||
BuildRequires: %{pymod devel}
|
||||
BuildRequires: %{pymod xml}
|
||||
BuildRequires: dbus-1-devel
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: hicolor-icon-theme
|
||||
@ -114,20 +119,6 @@ BuildRequires: libtool
|
||||
BuildRequires: libusb-1_0-devel
|
||||
BuildRequires: net-snmp-devel
|
||||
BuildRequires: pkgconfig
|
||||
# BuildRequires: python-rpm-macros
|
||||
# All printer driver packages should have "BuildRequires: python-cups"
|
||||
# because python-cups installs special rpm macros that adds Provides tags
|
||||
# for the printer drivers supported by the package,
|
||||
# see https://bugzilla.novell.com/show_bug.cgi?id=735865
|
||||
BuildRequires: %{pymod cups}
|
||||
BuildRequires: %{pymod devel}
|
||||
%if %use_qt5
|
||||
BuildRequires: %{pymod qt5-devel}
|
||||
%else
|
||||
BuildRequires: %{pymod qt4}
|
||||
BuildRequires: libqt4-devel
|
||||
%endif
|
||||
BuildRequires: %{pymod xml}
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: update-desktop-files
|
||||
# Require the exact matching version-release of the hpijs sub-package to make sure
|
||||
@ -138,26 +129,6 @@ Requires: %{name}-hpijs = %{version}-%{release}
|
||||
# Require the exact matching version-release of the sane sub-package to make sure
|
||||
# to have the exact matching version of libsane-hpaio installed:
|
||||
Requires: %{name}-sane = %{version}-%{release}
|
||||
# Since version 2.8.4 all interprocess communication uses dbus.
|
||||
# Therefore python-dbus version 0.80 or greater is required (which pulls in dbus base stuff).
|
||||
# The dbus stuff in HPLIP requires the Python module gobject
|
||||
# but there is no automated RPM requirement for python-gobject2,
|
||||
# see https://answers.launchpad.net/hplip/+question/30741
|
||||
%if 0%{pyversion} == 3
|
||||
Requires: dbus-1-python3 >= 0.80
|
||||
%else
|
||||
Requires: dbus-1-python >= 0.80
|
||||
%endif
|
||||
# Because foomatic-rip-hplip has CVE-2011-2697 (bnc#698451)
|
||||
# plus a leftover in CVE-2004-0801 (bnc#59233)
|
||||
# foomatic-rip-hplip is no longer installed and foomatic-rip
|
||||
# from foomatic-filters or cups-filters-foomatic-rip is used instead.
|
||||
# The RPM requirement for foomatic-filters should actually be
|
||||
# in the hplip-hpijs sub-package but this would bloat a minimalist system
|
||||
# (see the comment for the hplip-hpijs sub-package below).
|
||||
# Therefore the hplip main package which is intended
|
||||
# to get "all the HPLIP stuff" installed has the RPM requirement:
|
||||
Requires: foomatic-filters
|
||||
# foomatic-filters and cups-filters-foomatic-rip
|
||||
# do not require Ghostscript because depending on the PPD
|
||||
# (e.g. some PPDs for PostScript printers in OpenPrintingPPDs-postscript)
|
||||
@ -169,18 +140,6 @@ Requires: foomatic-filters
|
||||
# Therefore the hplip main package which is intended
|
||||
# to get "all the HPLIP stuff" installed has the RPM requirement:
|
||||
Requires: %{pymod %gobject}
|
||||
|
||||
# SLE does not provide python-pillow (PIL) (bsc#1131613)
|
||||
%if 0%{?is_opensuse}
|
||||
Requires: %{pymod Pillow}
|
||||
%endif
|
||||
Requires: ghostscript
|
||||
|
||||
%if %use_qt5
|
||||
Requires: %{pymod qt5}
|
||||
%else
|
||||
Requires: %{pymod qt4}
|
||||
%endif
|
||||
# Require special Python stuff (which pulls in Python base stuff).
|
||||
# At least since openSUSE 11.1 and SLE11 pyxml is no longer required
|
||||
# (pyxml was required in particular for openSUSE 10.3 and SLE10,
|
||||
@ -188,6 +147,17 @@ Requires: %{pymod qt4}
|
||||
# but meanwhile python-xml alone is sufficient for "import xml.parsers.expat"
|
||||
# see https://bugzilla.novell.com/show_bug.cgi?id=656779#c3
|
||||
Requires: %{pymod xml}
|
||||
# Because foomatic-rip-hplip has CVE-2011-2697 (bnc#698451)
|
||||
# plus a leftover in CVE-2004-0801 (bnc#59233)
|
||||
# foomatic-rip-hplip is no longer installed and foomatic-rip
|
||||
# from foomatic-filters or cups-filters-foomatic-rip is used instead.
|
||||
# The RPM requirement for foomatic-filters should actually be
|
||||
# in the hplip-hpijs sub-package but this would bloat a minimalist system
|
||||
# (see the comment for the hplip-hpijs sub-package below).
|
||||
# Therefore the hplip main package which is intended
|
||||
# to get "all the HPLIP stuff" installed has the RPM requirement:
|
||||
Requires: foomatic-filters
|
||||
Requires: ghostscript
|
||||
Requires(post): %{_bindir}/find
|
||||
Requires(post): /bin/grep
|
||||
Requires(post): /bin/sed
|
||||
@ -199,8 +169,32 @@ Obsoletes: hplip17
|
||||
# Obsolete the hplip3 copy that was introduced for older SLED11-GA HP preloads:
|
||||
Provides: hplip3 = 3.9.5
|
||||
Obsoletes: hplip3 < 3.9.5
|
||||
%if %use_qt5
|
||||
BuildRequires: %{pymod qt5-devel}
|
||||
%else
|
||||
BuildRequires: %{pymod qt4}
|
||||
BuildRequires: libqt4-devel
|
||||
%endif
|
||||
# Since version 2.8.4 all interprocess communication uses dbus.
|
||||
# Therefore python-dbus version 0.80 or greater is required (which pulls in dbus base stuff).
|
||||
# The dbus stuff in HPLIP requires the Python module gobject
|
||||
# but there is no automated RPM requirement for python-gobject2,
|
||||
# see https://answers.launchpad.net/hplip/+question/30741
|
||||
%if 0%{pyversion} == 3
|
||||
Requires: dbus-1-python3 >= 0.80
|
||||
%else
|
||||
Requires: dbus-1-python >= 0.80
|
||||
%endif
|
||||
# SLE does not provide python-pillow (PIL) (bsc#1131613)
|
||||
%if 0%{?is_opensuse}
|
||||
Requires: %{pymod Pillow}
|
||||
%endif
|
||||
%if %use_qt5
|
||||
Requires: %{pymod qt5}
|
||||
%else
|
||||
Requires: %{pymod qt4}
|
||||
%endif
|
||||
# Install into this non-root directory (required when norootforbuild is used):
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
# HPLIP's Python module cupsext.so has a build-time dependancy on the CUPS version:
|
||||
# It needs symbols (like ippFirstAttribute, ippNextAttribute, ippSetOperation etc)
|
||||
# that are defined only in libcups.so version > 1.5. For backward compatibility
|
||||
@ -372,7 +366,7 @@ Suggests: %{name} = %{version}
|
||||
Enhances: sane-backends
|
||||
# Automatically install this package if hpijs sub-package and sane-backends are
|
||||
# both installed:
|
||||
Supplements: packageand(%{name}-hpijs:sane-backends)
|
||||
Supplements: (%{name}-hpijs and sane-backends)
|
||||
|
||||
%description sane
|
||||
This sub-package includes only what is needed for plain scanning
|
||||
@ -416,12 +410,12 @@ This sub-package is only required by developers.
|
||||
|
||||
# replace "env" shebang and "/usr/bin/python" with real executable
|
||||
find . -name '*.py' -o -name pstotiff | \
|
||||
xargs -n 1 sed -i '1s,^#!\(/usr/bin/env python\|/usr/bin/python\),#!%{pyexe},'
|
||||
sed -i 's,/usr/bin/python\>,%{pyexe},' \
|
||||
xargs -n 1 sed -i '1s,^#!\(%{_bindir}/env python\|%{_bindir}/python\),#!%{pyexe},'
|
||||
sed -i 's,%{_bindir}/python\>,%{pyexe},' \
|
||||
data/rules/*
|
||||
|
||||
# replace icon not available on openSUSE
|
||||
sed -i -e 's|/usr/share/icons/Humanity/devices/48/printer.svg|printer|' hp-uiscan.desktop.in
|
||||
sed -i -e 's|%{_datadir}/icons/Humanity/devices/48/printer.svg|printer|' hp-uiscan.desktop.in
|
||||
|
||||
%build
|
||||
# If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake)
|
||||
@ -664,7 +658,7 @@ install -m 644 %{SOURCE102} %{buildroot}%{_mandir}/man1/
|
||||
|
||||
# SLE does not provide python-pillow (PIL) (bsc#1131613)
|
||||
%if !0%{?is_opensuse}
|
||||
rm -f %{buildroot}/usr/share/hplip/scan.py %{buildroot}%{_bindir}/hp-scan
|
||||
rm -f %{buildroot}%{_datadir}/hplip/scan.py %{buildroot}%{_bindir}/hp-scan
|
||||
cat >%{buildroot}%{_bindir}/hp-scan <<EOF
|
||||
#! /bin/sh
|
||||
echo 'Please use "scanimage" from the "sane-backends" package instead.' >&2
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user