pool/hplip
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 441896 from home:mwilck:branches:Printing

Browse Source 
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
This commit is contained in:
Martin Wilck 2016-11-24 17:33:18 +00:00 committed by Git OBS Bridge
parent c9fcff29f2
commit 6d597728fc
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hplip.changes
View File

@ -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 Fri Nov 18 11:23:38 UTC 2016 - jweberhofer@weberhofer.at
- Version upgrade to 3.16.10: - Version upgrade to 3.16.10:

8
hplip.spec
View File

@ -229,7 +229,6 @@ http://hplipopensource.com
%package hpijs %package hpijs
Summary: Only plain printing with HPLIP printer drivers Summary: Only plain printing with HPLIP printer drivers
Group: Hardware/Printing
# On a minimalist system only hplip-hpijs may be installed # On a minimalist system only hplip-hpijs may be installed
# or on a minimalist package repository (e.g. on the openSUSE CDs) # 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). # 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 # 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 # 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): # only hplip-1.2.3-6.7 is available which should usually also work):
Group: Hardware/Printing
Suggests: %{name} = %{version} Suggests: %{name} = %{version}
# Since Nov 14 2007 ghostscript-library does no longer require /usr/bin/hpijs # Since Nov 14 2007 ghostscript-library does no longer require /usr/bin/hpijs
# but only "Suggests hplip-hpijs" (see Novell/Suse Bugzilla bnc#341564). # 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 %package sane
Summary: Only plain scanning with HPLIP scan drivers 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 # 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. # to have the exact matching version of libhpip and libhpmud installed.
# A wrong library version may let libsane-hpaio crash (e.g. segfault) # A wrong library version may let libsane-hpaio crash (e.g. segfault)
# which lets the whole scanning stack frontend<->libsane-dll<->libsane-backend crash # 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"): # also for any other backend when the hpaio backend is enabled (e.g. "scanimage -L"):
Group: Hardware/Scanner
Requires: %{name}-hpijs = %{version}-%{release} Requires: %{name}-hpijs = %{version}-%{release}
# See comment in hpijs sub-package for same Suggests: # See comment in hpijs sub-package for same Suggests:
Suggests: %{name} = %{version} Suggests: %{name} = %{version}
@ -329,9 +329,9 @@ with the scan drivers in HPLIP for standard HP all-in-one printers.
%package devel %package devel
Summary: Development files for hplip 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 # 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: # to have the exact matching version of libhpip and libhpmud installed:
Group: Development/Languages/C and C++
Requires: %{name}-hpijs = %{version}-%{release} Requires: %{name}-hpijs = %{version}-%{release}
# Require the exact matching version-release of the sane sub-package to make sure # Require the exact matching version-release of the sane sub-package to make sure
# to have the exact matching version of libsane-hpaio installed: # to have the exact matching version of libsane-hpaio installed:
@ -643,7 +643,7 @@ exit 0
%files %files
%defattr(-, root, root) %defattr(-, root, root)
%config %{_sysconfdir}/xdg/autostart/hplip-systray.desktop %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
%dir %{_prefix}/lib/udev/rules.d %dir %{_prefix}/lib/udev/rules.d
%endif %endif