Accepting request 345335 from home:ecsos

update to 3.15.11. Some other changes, see hplip.changes

OBS-URL: https://build.opensuse.org/request/show/345335
OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=122
This commit is contained in:
Tomáš Chvátal
2015-12-08 20:07:21 +00:00
committed by Git OBS Bridge
parent 2fdecea380
commit 6b5e16a864
8 changed files with 177 additions and 78 deletions

View File

@@ -16,8 +16,14 @@
#
%if 0%{?suse_version} == 1315 && 0%{?is_opensuse}
%define is_leap 1
%else
%define is_leap 0
%endif
Name: hplip
Version: 3.15.9
Version: 3.15.11
Release: 0
Summary: HP's Printing, Scanning, and Faxing Software
License: BSD-3-Clause and GPL-2.0+ and MIT
@@ -41,10 +47,6 @@ Source102: hpijs.1.gz
# Patch100... is for special Suse patches:
# Patch101 change-udev-rules.diff changes the udev rules file 56-hpmud.rules
Patch101: change-udev-rules.diff
# Patch104 do_not_open_mdns_port.diff deactivates the open_mdns_port functionality
# in distros.dat for SUSE distros to avoid security issues when ports in the firewall
# get opened. see https://bugs.launchpad.net/bugs/426161
Patch104: do_not_open_mdns_port.diff
# Patch106 disable_hp-upgrade.patch disables hp-upgrade/upgrade.py for security reasons,
# see https://bugzilla.novell.com/show_bug.cgi?id=853405
# To upgrade HPLIP an openSUSE software package manager like YaST or zypper should be used.
@@ -72,13 +74,13 @@ Patch108: add_missing_includes_and_define_GNU_SOURCE.patch
# In contrast when it was built with CUPS < 1.6 there must not be a run-time requirement
# for a CUPS version to ensure it works on SLE12 both with CUPS 1.7.5 and CUPS 1.5.4.
# For suse_version values see https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto
%if 0%{?suse_version} > 1320
%if 0%{?suse_version} > 1320 || %{is_leap}
# For openSUSE after 13.2 (i.e. for current openSUSE Factory) CUPS > 1.5 is provided and required:
BuildRequires: cups > 1.5
BuildRequires: cups-devel > 1.5
Requires: cups > 1.5
%endif
%if 0%{?suse_version} == 1315
%if 0%{?suse_version} == 1315 && !%{is_leap}
# For SLE12 build it with traditional CUPS 1.5.4 to ensure it works on SLE12 both with CUPS 1.7.5 and CUPS 1.5.4.
# Only in the Printing project for SLE12 use cups154 and cups154-devel (from the cups154-SLE12 source package):
BuildRequires: cups154
@@ -340,10 +342,6 @@ This sub-package is only required by developers.
%setup -q
# Patch101 change-udev-rules.diff changes the udev rules file 56-hpmud.rules
%patch101 -b .change-udev-rules.orig
# Patch104 do_not_open_mdns_port.diff deactivates the open_mdns_port functionality
# in distros.dat for SUSE distros to avoid security issues when ports in the firewall
# get opened. see https://bugs.launchpad.net/bugs/426161
%patch104 -b .do_not_open_mdns_port.orig
# Patch106 disable_hp-upgrade.patch disables hp-upgrade/upgrade.py for security reasons,
# see https://bugzilla.novell.com/show_bug.cgi?id=853405
# To upgrade HPLIP an openSUSE software package manager like YaST or zypper should be used.
@@ -351,7 +349,11 @@ This sub-package is only required by developers.
%patch107 -p1 -b .udev_rules_dir.orig
# Patch108 add_missing_includes_and_define_GNU_SOURCE.patch adds missing '#include <...>'
# and missing '#define _GNU_SOURCE' see https://bugs.launchpad.net/hplip/+bug/1456590
%patch108 -b .add_missing_includes_and_define_GNU_SOURCE.orig
%patch108 -p1 -b .add_missing_includes_and_define_GNU_SOURCE.orig
# rpmlint: fix incorrect-fsf-address
find . -type f | xargs sed -i -e 's:59 Temple Place\, Suite 330\, Boston\, MA 02111-1307 USA:51 Franklin Street\, Fifth Floor\, Boston\, MA 02110-1301 USA:g'
find . -type f | xargs sed -i -e 's:59 Temple Place\, Suite 330\, Boston\, MA 02111-1307 USA:51 Franklin Street\, Fifth Floor\, Boston\, MA 02110-1301 USA:g'
find . -type f | xargs sed -i -e 's:59 Temple Place\, Suite 330\, Boston\, MA 02111-1307 USA:51 Franklin Street\, Fifth Floor\, Boston\, MA 02110-1301 USA:g'
%build
# If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake)
@@ -641,7 +643,7 @@ exit 0
%files
%defattr(-, root, root)
%config %{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%if 0%{?suse_version} == 1110
%if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1320 || %{is_leap}
%dir /usr/lib/udev
%dir /usr/lib/udev/rules.d
%endif
@@ -711,6 +713,7 @@ exit 0
%{_libdir}/libhpip.so.*
%{_libdir}/libhpipp.so.*
%{_libdir}/libhpmud.so.*
%{_libdir}/libhpdiscovery.so.*
%dir %{_libexecdir}/cups
%dir %{_libexecdir}/cups/backend
%{_libexecdir}/cups/backend/hp
@@ -743,6 +746,7 @@ exit 0
%{_libdir}/libhpip.so
%{_libdir}/libhpipp.so
%{_libdir}/libhpmud.so
%{_libdir}/libhpdiscovery.so
%{_libdir}/*.la
%{_libdir}/sane/libsane-hpaio.so
%{_libdir}/sane/*.la