diff --git a/hplip-check-cups.patch b/hplip-check-cups.patch new file mode 100644 index 0000000..d688dbd --- /dev/null +++ b/hplip-check-cups.patch @@ -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), diff --git a/hplip.spec b/hplip.spec index 35d567c..62001ad 100644 --- a/hplip.spec +++ b/hplip.spec @@ -13,7 +13,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.17.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and MIT and BSD Url: http://hplip.sourceforge.net/ @@ -43,6 +43,7 @@ Patch21: hplip-strncpy.patch Patch22: hplip-no-write-bytecode.patch Patch23: hplip-silence-ioerror.patch Patch24: hplip-3165-sourceoption.patch +Patch25: hplip-check-cups.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: python3-pillow @@ -222,6 +223,8 @@ done # [abrt] hplip: hp-scan:663::NameError: name 'source_option' is not defined (bug #1341304) %patch24 -p1 -b .sourceoption +# hp-check shows 'CUPS incompatible or not running' even if CUPS is running (bug #1456467) +%patch25 -p1 -b .check-cups sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -484,6 +487,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %postun libs -p /sbin/ldconfig %changelog +* Mon May 29 2017 Zdenek Dohnal - 3.17.4-2 +- 1456467 - hp-check shows 'CUPS incompatible or not running' even if CUPS is running + * Mon Apr 24 2017 Zdenek Dohnal - 3.17.4-1 - rebase to 3.17.4 - set plugincheck to 0