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

1456467 - hp-check shows 'CUPS incompatible or not running' even if CUPS is running

Browse Source
This commit is contained in:
Zdenek Dohnal 2017-05-30 13:35:56 +02:00
commit bee821c981
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hplip-check-cups.patch Normal file
View File

@ -0,0 +1,14 @@
diff -up hplip-3.17.4/installer/core_install.py.check-cups hplip-3.17.4/installer/core_install.py
--- hplip-3.17.4/installer/core_install.py.check-cups 2017-05-29 16:39:41.172572873 +0200
+++ hplip-3.17.4/installer/core_install.py 2017-05-29 16:42:12.199386100 +0200
@@ -338,9 +338,8 @@ class CoreInstall(object):
# Required base packages
'libjpeg': (True, ['base'], JPEG_STR, self.check_libjpeg, DEPENDENCY_RUN_AND_COMPILE_TIME,'-',None, GENERALDEP),
'libtool': (True, ['base'], LIBTOOL_STR, self.check_libtool, DEPENDENCY_COMPILE_TIME,'-','libtool --version',COMPILEDEP),
- 'cups' : (True, ['base'], CUPS_STR, self.check_cups, DEPENDENCY_RUN_TIME,'1.1','cups-config --version', EXTERNALDEP),
+ 'cups' : (True, ['base'], CUPS_STR, self.check_cups, DEPENDENCY_RUN_TIME,'1.1','rpm -qa cups', EXTERNALDEP),
'cups-devel': (True, ['base'], CUPS_DEV_STR, self.check_cups_devel, DEPENDENCY_COMPILE_TIME,'-','cups-config --version', GENERALDEP),
- 'cups-image': (True, ['base'], CUPS_IMG_STR, self.check_cups_image, DEPENDENCY_COMPILE_TIME,'-','cups-config --version', GENERALDEP),
'gcc' : (True, ['base'], GCC_STR, self.check_gcc, DEPENDENCY_COMPILE_TIME, '-','gcc --version',COMPILEDEP),
'make' : (True, ['base'], MAKE_STR, self.check_make, DEPENDENCY_COMPILE_TIME,'3.0','make --version',COMPILEDEP),
'libpthread' : (True, ['base'], THREAD_STR, self.check_libpthread, DEPENDENCY_RUN_AND_COMPILE_TIME, '-','FUNC#get_libpthread_version', GENERALDEP),

9
hplip.spec
View File

@ -13,7 +13,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.17.4
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2 and MIT and BSD
Url: http://hplipopensource.com/
@ -46,6 +46,7 @@ Patch23: hplip-silence-ioerror.patch
Patch24: hplip-3165-sourceoption.patch
Patch25: hplip-noernie.patch
Patch26: hplip-appdata.patch
Patch27: hplip-check-cups.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: python3-pillow
@ -234,6 +235,9 @@ done
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
sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in
@ -527,6 +531,9 @@ update-desktop-database &> /dev/null ||:
%postun libs -p /sbin/ldconfig
%changelog
* Mon May 29 2017 Zdenek Dohnal <zdohnal@redhat.com> - 3.17.4-4
- 1456467 - hp-check shows 'CUPS incompatible or not running' even if CUPS is running
* Tue May 09 2017 Zdenek Dohnal <zdohnal@redhat.com> - 3.17.4-3
- added appdata.xml, several tools moved into gui subpackage because they don't have CLI variant and use only GUI, hp-pqdiag was removed because it is deprecated and not functional