From 6d597728fc9eadc9a666081675e04dc272df1d259a445d9cb5a6e11d3ae9dd58 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Thu, 24 Nov 2016 17:33:18 +0000 Subject: [PATCH] Accepting request 441896 from home:mwilck:branches:Printing Fix build errors for SLES12 SP2. OBS-URL: https://build.opensuse.org/request/show/441896 OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=133 --- hplip.changes | 6 ++++++ hplip.spec | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/hplip.changes b/hplip.changes index 21bcccb..42abce4 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 23 20:19:53 UTC 2016 - martin.wilck@suse.com + +- Fixed SLES12 SP2 build problem in + %files section for /usr/lib/udev/rules.d + +------------------------------------------------------------------. Fri Nov 18 11:23:38 UTC 2016 - jweberhofer@weberhofer.at - Version upgrade to 3.16.10: diff --git a/hplip.spec b/hplip.spec index 3f9e51b..0afd707 100644 --- a/hplip.spec +++ b/hplip.spec @@ -229,7 +229,6 @@ 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). @@ -248,6 +247,7 @@ Group: Hardware/Printing # 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 +309,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 +329,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: @@ -643,7 +643,7 @@ exit 0 %files %defattr(-, root, root) %config %{_sysconfdir}/xdg/autostart/hplip-systray.desktop -%if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1320 || %{is_leap} +%if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1320 || 0%{?suse_version} == 1315 %dir %{_prefix}/lib/udev %dir %{_prefix}/lib/udev/rules.d %endif