diff --git a/hplip.changes b/hplip.changes index 5f31c73..8bafb08 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Mar 13 08:51:52 UTC 2017 - fvogt@suse.com + +- Use Qt5 on Tumbleweed and Leap >= 42.2 (bsc#1018734) + +------------------------------------------------------------------- +Thu Mar 2 11:21:02 CET 2017 - jsmeix@suse.de + +- Support most recent HP printing devices for SLE12 by upgrading + HPLIP to the version that we have currently (as of this writing) + in openSUSE Factory and this is in use on openSUSE Tumbleweed + see https://fate.suse.com/322305 (fate#322305). + In general regarding version upgrades for printer drivers + see https://en.opensuse.org/SDB:Installing_a_Printer + ------------------------------------------------------------------- Thu Feb 9 17:20:28 UTC 2017 - Mathias.Homann@opensuse.org diff --git a/hplip.spec b/hplip.spec index d2be12e..79ef07c 100644 --- a/hplip.spec +++ b/hplip.spec @@ -32,6 +32,13 @@ BuildRequires: systemd-rpm-macros # For SLE11 redefine _libexecdir because on SLE11 _libexecdir is "/usr/lib64": %global _libexecdir %{_prefix}/lib %endif +# Use Qt5 frontend on TW and Leap >= 42.2 +%if 0%{?is_opensuse} && (0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200) +%global use_qt5 1 +%else +%global use_qt5 0 +%endif + Name: hplip Version: 3.16.11 Release: 0 @@ -76,7 +83,6 @@ BuildRequires: hicolor-icon-theme BuildRequires: libdrm-devel BuildRequires: libgphoto2-devel BuildRequires: libjpeg-devel -BuildRequires: libqt4-devel BuildRequires: libtool BuildRequires: libusb-1_0-devel BuildRequires: net-snmp-devel @@ -88,7 +94,12 @@ BuildRequires: pkgconfig BuildRequires: python-cups BuildRequires: python-devel BuildRequires: python-openssl +%if %use_qt5 +BuildRequires: python-qt5-devel +%else +BuildRequires: libqt4-devel BuildRequires: python-qt4 +%endif BuildRequires: python-xml BuildRequires: readline-devel BuildRequires: update-desktop-files @@ -128,8 +139,12 @@ Requires: foomatic-filters # to get "all the HPLIP stuff" installed has the RPM requirement: Requires: ghostscript Requires: python-gobject2 -# Since version 3.9.2 by default only Qt4 is used: + +%if %use_qt5 +Requires: python-qt5 +%else Requires: python-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, @@ -229,6 +244,7 @@ http://hplipopensource.com %package hpijs Summary: Only plain printing with HPLIP printer drivers +Group: Hardware/Printing # On a minimalist system only hplip-hpijs may be installed # or on a minimalist package repository (e.g. on the openSUSE CDs) # only hplip-hpijs may be available (even when a usual system is installed). @@ -247,7 +263,6 @@ Summary: Only plain printing with HPLIP printer drivers # may be not available to be installed (e.g. when hplip-hpijs-1.2.3-4.5 is # installed from the openSUSE CDs but on our official online repository # only hplip-1.2.3-6.7 is available which should usually also work): -Group: Hardware/Printing Suggests: %{name} = %{version} # Since Nov 14 2007 ghostscript-library does no longer require /usr/bin/hpijs # but only "Suggests hplip-hpijs" (see Novell/Suse Bugzilla bnc#341564). @@ -309,12 +324,12 @@ For full documentation and license see the main-package hplip. %package sane Summary: Only plain scanning with HPLIP scan drivers +Group: Hardware/Scanner # Require the exact matching version-release of the hpijs sub-package to make sure # to have the exact matching version of libhpip and libhpmud installed. # A wrong library version may let libsane-hpaio crash (e.g. segfault) # which lets the whole scanning stack frontend<->libsane-dll<->libsane-backend crash # also for any other backend when the hpaio backend is enabled (e.g. "scanimage -L"): -Group: Hardware/Scanner Requires: %{name}-hpijs = %{version}-%{release} # See comment in hpijs sub-package for same Suggests: Suggests: %{name} = %{version} @@ -329,9 +344,9 @@ with the scan drivers in HPLIP for standard HP all-in-one printers. %package devel Summary: Development files for hplip +Group: Development/Languages/C and C++ # Require the exact matching version-release of the hpijs sub-package to make sure # to have the exact matching version of libhpip and libhpmud installed: -Group: Development/Languages/C and C++ 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: @@ -390,7 +405,13 @@ export CXXFLAGS="%{optflags} -fno-strict-aliasing" # so that --with-htmldir must be explicitly set. %configure \ --disable-qt3 \ +%if %use_qt5 + --disable-qt4 \ + --enable-qt5 \ +%else --enable-qt4 \ + --disable-qt5 \ +%endif --disable-policykit \ --enable-doc-build \ --enable-network-build \