|
@@ -2,22 +2,25 @@
|
|
|
Summary: HP printer drivers & utilities for Linux
|
|
|
Summary(ja): HP プリンタの Linux 向けドライバとユーティリティ
|
|
|
Name: hplip
|
|
|
-Version: 3.20.6
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 3.21.10
|
|
|
+Release: 1%{?_dist_release}
|
|
|
+Group: publishing
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
Packager: kazutaka
|
|
|
|
|
|
License: GPLv2+, MIT and BSD
|
|
|
-Group: Applications/Publishing
|
|
|
URL: https://developers.hp.com/hp-linux-imaging-and-printing
|
|
|
-
|
|
|
-Source0: http://downloads.sourceforge.net/sourceforge/hplip/hplip-%{version}.tar.gz
|
|
|
+# Source0: http://downloads.sourceforge.net/sourceforge/hplip/hplip-%{version}.tar.gz
|
|
|
+# ./hplip-repack.sh <version>
|
|
|
+Source0: hplip-%{version}-repack.tar.gz
|
|
|
#Source1: hpcups-update-ppds.sh
|
|
|
Source2: copy-deviceids.py
|
|
|
Source3: %{name}.metainfo.xml
|
|
|
Source4: hp-laserjet_cp_1025nw.ppd.gz
|
|
|
Source5: hp-laserjet_professional_p_1102w.ppd.gz
|
|
|
+Source6: hplip-repack.sh
|
|
|
+
|
|
|
Source1000: hplip.desktop.vine
|
|
|
|
|
|
Patch1: hplip-pstotiff-is-rubbish.patch
|
|
@@ -65,7 +68,7 @@ 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
|
|
|
# FPG by two ways - shipping binary blob and non open source code - so it needs to be removed.
|
|
|
# Patch is taken from Debian.
|
|
|
-Patch37: 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
|
|
|
# unusable (crashed on the start). The patch removes usages of variables, which were
|
|
|
# commented out.
|
|
@@ -163,10 +166,49 @@ Patch56: hplip-revert-plugins.patch
|
|
|
# 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
|
|
|
+#Patch57: hplip-thread-isalive-removed.patch
|
|
|
+# glibc moved timeb.h into compat package and it will be removed in the future
|
|
|
+# the code doesn't use anything from timeb.h, so it is safe to remove it
|
|
|
+# reported upstream https://bugs.launchpad.net/hplip/+bug/1900977
|
|
|
+#Patch58: hplip-timeb-removed.patch
|
|
|
+# non-sudoers cannot authenticate
|
|
|
+# reported upstream https://bugs.launchpad.net/hplip/+bug/1904888
|
|
|
+Patch59: hplip-check-userperms.patch
|
|
|
+# 1919556 - hp-fab crashed: QFileDialog.getOpenFileName is not used correctly
|
|
|
+# getOpenFileName returns a tuple, but hp-fab expects a simple variable
|
|
|
+# reported upstream as https://bugs.launchpad.net/hplip/+bug/1914743
|
|
|
+Patch60: hplip-fab-import.patch
|
|
|
+# if an user tries to install scanner via hp-setup (printer/fax utility)
|
|
|
+# it fails further down - break out earlier with a message
|
|
|
+# reported upstream as https://bugs.launchpad.net/hplip/+bug/1916114
|
|
|
+Patch61: hplip-hpsetup-noscanjets.patch
|
|
|
+# 1951922 - hp-systray doesn't support a valid --qt5 option
|
|
|
+# reported upstream https://bugs.launchpad.net/hplip/+bug/1925480
|
|
|
+Patch62: hplip-systray-qt5.patch
|
|
|
+# 1963114 - patch for hplip firmware load timeout fix
|
|
|
+# reported upstream https://bugs.launchpad.net/hplip/+bug/1922404
|
|
|
+Patch63: hplip-hpfirmware-timeout.patch
|
|
|
+# 1976465 - [hplip] PY_SSIZE_T_CLEAN macro must be defined for '#' formats
|
|
|
+# reported upstream https://bugs.launchpad.net/hplip/+bug/1933973
|
|
|
+Patch64: hplip-pyssizet_clean.patch
|
|
|
+# 1985251 - Incorrect permission for gpg directory
|
|
|
+# reported upstream https://bugs.launchpad.net/hplip/+bug/1938442
|
|
|
+Patch65: hplip-gpgdir-perms.patch
|
|
|
+# 1987141 - hp-plugin installs malformed udev files
|
|
|
+# reported upstream https://bugs.launchpad.net/hplip/+bug/1847477
|
|
|
+Patch66: hplip-plugin-udevissues.patch
|
|
|
+# reported upstream https://bugs.launchpad.net/hplip/+bug/1938504
|
|
|
+Patch67: hplip-osname-mismatch.patch
|
|
|
+# 2015428 - python3.10 has Callable in collections.abc
|
|
|
+# reported as https://bugs.launchpad.net/hplip/+bug/1948801
|
|
|
+Patch68: hplip-py310-collections-abc.patch
|
|
|
+# 2015428 - python3.10 doesn't do an implicit conversion when passing decimals
|
|
|
+# fractions and others to an integer argument
|
|
|
+# reported as https://bugs.launchpad.net/hplip/+bug/1948801
|
|
|
+Patch69: hplip-qt5-convert2int.patch
|
|
|
|
|
|
# Vine Patches
|
|
|
-Patch70: hplip-3.11.5-gksu.patch
|
|
|
+Patch70: hplip-drop-imageProcessor.patch
|
|
|
Patch80: hplip-3.16.5-hpijs.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
@@ -177,6 +219,7 @@ Requires: foomatic
|
|
|
Requires: ghostscript
|
|
|
Requires: openssl
|
|
|
Requires: %{name}-libs = %{version}-%{release}
|
|
|
+BuildRequires: avahi-devel
|
|
|
BuildRequires: cups-devel
|
|
|
BuildRequires: dbus-devel
|
|
|
BuildRequires: desktop-file-utils
|
|
@@ -216,7 +259,7 @@ Hewlett-Packard Linux Imaging and Printing Project は HP 製プリンタ及び
|
|
|
%package libs
|
|
|
Summary: HPLIP libraries
|
|
|
Summary(ja): HPLIP ライブラリ
|
|
|
-Group: System Environment/Libraries
|
|
|
+Group: system
|
|
|
License: GPLv2+ and MIT
|
|
|
Requires: python3
|
|
|
|
|
@@ -231,12 +274,13 @@ HPLIP 用のライブラリです。
|
|
|
%package gui
|
|
|
Summary: HPLIP graphical tools
|
|
|
Summary(ja): HPLIP 用 GUI ツール
|
|
|
-Group: Applications/System
|
|
|
+Group: publishing
|
|
|
License: BSD
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
Requires: python3-qt5
|
|
|
#Requires: python3-reportlab
|
|
|
Requires: python3-pygobject
|
|
|
+Requires: python3-pillow
|
|
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
|
|
Requires: libsane-hpaio%{?_isa} = %{version}-%{release}
|
|
|
|
|
@@ -253,7 +297,7 @@ HP デバイスマネージャ (toolbox) は、各種設定やインクや紙の
|
|
|
%package -n libsane-hpaio
|
|
|
Summary: SANE driver for scanners in HP's multi-function devices
|
|
|
Summary(ja): HP 複合機のスキャナ用 SANE ドライバ
|
|
|
-Group: System Environment/Libraries
|
|
|
+Group: system
|
|
|
License: GPLv2+
|
|
|
Requires: %{name}-libs = %{version}-%{release}
|
|
|
Requires: sane
|
|
@@ -377,8 +421,6 @@ done
|
|
|
# hplip appdata
|
|
|
%patch26 -p1 -b .appdata
|
|
|
|
|
|
-rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
|
|
|
-
|
|
|
# hp-check shows 'CUPS incompatible or not running' even if CUPS is running (bug #1456467)
|
|
|
%patch27 -p1 -b .check-cups
|
|
|
|
|
@@ -413,7 +455,7 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
|
|
|
%patch36 -p1 -b .qmsgbox-typos-fix
|
|
|
|
|
|
# removal of non open source code, taken from ubuntu
|
|
|
-%patch37 -p1 -b .libimageprocessor-removal
|
|
|
+#patch37 -p1 -b .libimageprocessor-removal
|
|
|
|
|
|
%__rm prnt/hpcups/libImageProcessor-x86*
|
|
|
|
|
@@ -451,11 +493,37 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
|
|
|
%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
|
|
|
+#patch57 -p1 -b .thread-isalive-removed
|
|
|
+# timed.h is removed from glibc
|
|
|
+#patch58 -p1 -b .timed-removed
|
|
|
+# 1899410 - non-sudoers cannot authenticate because of bad username in prompt
|
|
|
+%patch59 -p1 -b .check-userperms
|
|
|
+# 1919556 - hp-fab crashed: QFileDialog.getOpenFileName is not used correctly
|
|
|
+%patch60 -p1 -b .fab-import
|
|
|
+# if an user tries to install scanner via hp-setup (printer/fax utility)
|
|
|
+# it fails further down - break out earlier with a message
|
|
|
+%patch61 -p1 -b .hpsetup-noscanjets
|
|
|
+# 1951922 - hp-systray doesn't support a valid --qt5 option
|
|
|
+%patch62 -p1 -b .systray-qt5
|
|
|
+# 1963114 - patch for hplip firmware load timeout fix
|
|
|
+%patch63 -p1 -b .hpfirmware-timeout
|
|
|
+# 1976465 - [hplip] PY_SSIZE_T_CLEAN macro must be defined for '#' formats
|
|
|
+%patch64 -p1 -b .pyssizet_clean
|
|
|
+# 1985251 - Incorrect permission for gpg directory
|
|
|
+%patch65 -p1 -b .gpgdir-perms
|
|
|
+# 1987141 - hp-plugin installs malformed udev files
|
|
|
+%patch66 -p1 -b .hpplugin-udevperms
|
|
|
+# upstream bug https://bugs.launchpad.net/hplip/+bug/1938504
|
|
|
+%patch67 -p1 -b .osname-mismatch
|
|
|
+# 2015428 - python3.10 has Callable in collections.abc
|
|
|
+%patch68 -p1 -b .abc
|
|
|
+# 2015428 - python3.10 doesn't do an implicit conversion when passing decimals
|
|
|
+# fractions and others to an integer argument
|
|
|
+%patch69 -p1 -b .qt5-convert2int.patch
|
|
|
|
|
|
# vine
|
|
|
|
|
|
-#%patch70 -p1 -b .gksu
|
|
|
+%patch70 -p1
|
|
|
%patch80 -p1 -b .hpijs
|
|
|
|
|
|
sed -i.duplex-constraints \
|
|
@@ -480,6 +548,7 @@ sed -i 's|^AM_INIT_AUTOMAKE|AM_INIT_AUTOMAKE([foreign])|g' configure.in
|
|
|
touch NEWS README AUTHORS ChangeLog
|
|
|
autoreconf -fiv
|
|
|
%configure \
|
|
|
+ --disable-imageProcessor-build \
|
|
|
--enable-scan-build --enable-gui-build --enable-fax-build \
|
|
|
--disable-foomatic-rip-hplip-install --enable-pp-build \
|
|
|
--disable-qt4 --enable-qt5 \
|
|
@@ -610,10 +679,6 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
-%post libs -p /sbin/ldconfig
|
|
|
-%postun libs -p /sbin/ldconfig
|
|
|
-
|
|
|
-
|
|
|
%files
|
|
|
%defattr(-,root,root)
|
|
|
%doc COPYING doc/*
|
|
@@ -751,6 +816,12 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Nov 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.21.10-1
|
|
|
+- new upstream release.
|
|
|
+- dropped Patch37 and 57: fixed in upstream.
|
|
|
+- imported Patch59-69 from rawhide.
|
|
|
+- dropped ldconfig scriptlets.
|
|
|
+
|
|
|
* Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.20.6-2
|
|
|
- rebuilt with net-snmp-5.9.
|
|
|
|