From c76f56bccea306d1e44537fc8dee0aae27a83db8 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Mon, 3 Sep 2018 05:54:34 +0200 Subject: [PATCH] - updated to 3.18.6 - updated pld-distro patch - added destdir patch --- hplip-destdir.patch | 23 +++++++++++++++++++++++ hplip.spec | 9 ++++++--- pld-distro.patch | 20 ++++++++++---------- 3 files changed, 39 insertions(+), 13 deletions(-) create mode 100644 hplip-destdir.patch diff --git a/hplip-destdir.patch b/hplip-destdir.patch new file mode 100644 index 0000000..2c6b620 --- /dev/null +++ b/hplip-destdir.patch @@ -0,0 +1,23 @@ +--- hplip-3.18.6/Makefile.am.orig 2018-09-02 18:32:31.253307873 +0200 ++++ hplip-3.18.6/Makefile.am 2018-09-02 18:50:52.193295299 +0200 +@@ -701,14 +701,14 @@ + echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \ + fi; \ + if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/x86_64-linux-gnu/sane" \) ]; then \ +- ln -sf $(libdir)/sane/libsane-hpaio.so $(libdir)/x86_64-linux-gnu/sane/ ; \ +- ln -sf $(libdir)/sane/libsane-hpaio.so.1 $(libdir)/x86_64-linux-gnu/sane/ ; \ ++ ln -sf $(libdir)/sane/libsane-hpaio.so $(DESTDIR)$(libdir)/x86_64-linux-gnu/sane/ ; \ ++ ln -sf $(libdir)/sane/libsane-hpaio.so.1 $(DESTDIR)$(libdir)/x86_64-linux-gnu/sane/ ; \ + fi; \ + if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/i386-linux-gnu" \) ]; then \ +- ln -sf $(libdir)/libhpmud.so.0.0.6 $(libdir)/i386-linux-gnu/libhpmud.so ; \ +- ln -sf $(libdir)/libhpmud.so.0.0.6 $(libdir)/i386-linux-gnu/libhpmud.so.0 ; \ +- ln -sf $(libdir)/sane/libsane-hpaio.so.1.0.0 $(libdir)/i386-linux-gnu/sane/libsane-hpaio.so.1 ; \ +- ln -sf $(libdir)/sane/libsane-hpaio.so.1.0.0 $(libdir)/i386-linux-gnu/sane/libsane-hpaio.so ; \ ++ ln -sf $(libdir)/libhpmud.so.0.0.6 $(DESTDIR)$(libdir)/i386-linux-gnu/libhpmud.so ; \ ++ ln -sf $(libdir)/libhpmud.so.0.0.6 $(DESTDIR)$(libdir)/i386-linux-gnu/libhpmud.so.0 ; \ ++ ln -sf $(libdir)/sane/libsane-hpaio.so.1.0.0 $(DESTDIR)$(libdir)/i386-linux-gnu/sane/libsane-hpaio.so.1 ; \ ++ ln -sf $(libdir)/sane/libsane-hpaio.so.1.0.0 $(DESTDIR)$(libdir)/i386-linux-gnu/sane/libsane-hpaio.so ; \ + fi \ + fi + endif #HPLIP_CLASS_DRIVER diff --git a/hplip.spec b/hplip.spec index d146425..db032d3 100644 --- a/hplip.spec +++ b/hplip.spec @@ -13,12 +13,12 @@ Summary: Hewlett-Packard Linux Imaging and Printing suite - printing and scanning using HP devices Summary(pl.UTF-8): Narzędzia Hewlett-Packard Linux Imaging and Printing - drukowanie i skanowanie przy użyciu urządzeń HP Name: hplip -Version: 3.17.11 +Version: 3.18.6 Release: 1 License: BSD (hpijs), MIT (low-level scanning and printing code), GPL v2 (the rest) Group: Applications/System Source0: http://downloads.sourceforge.net/hplip/%{name}-%{version}.tar.gz -# Source0-md5: 09f3d50a2ba95e0fb66c78da7bab13ba +# Source0-md5: 3857eae76c49c00fa185628d4dce7d61 Patch0: %{name}-desktop.patch Patch1: unresolved.patch Patch2: pld-distro.patch @@ -26,11 +26,13 @@ Patch2: pld-distro.patch # version have different md5 sums, different offsets, so handling new binaries need # to be added Patch3: %{name}-binary-fixup.patch +Patch4: %{name}-destdir.patch Patch5: %{name}-udev-rules.patch URL: http://hplipopensource.com/ BuildRequires: autoconf BuildRequires: automake BuildRequires: cups-devel >= 1.2 +BuildRequires: cups-ppdc >= 1.2 %{?with_dbus:BuildRequires: dbus-devel >= 1.0.0} BuildRequires: libjpeg-devel BuildRequires: libstdc++-devel @@ -169,6 +171,7 @@ urządzenia HP AiO. %patch1 -p1 %patch2 -p1 #%patch3 -p1 +%patch4 -p1 %patch5 -p1 %{__sed} -i -e '1s,^#!/usr/bin/env python$,#!%{__python},' *.py fax/filters/pstotiff prnt/filters/hpps @@ -219,7 +222,7 @@ done ln -s %{cups_filterdir}/foomatic-rip $RPM_BUILD_ROOT%{cups_filterdir}/foomatic-rip-hplip # useless (nothing is going to link to installed libraries/modules) -%{__rm} $RPM_BUILD_ROOT{%{_libdir}/*.{so,la},%{_libdir}/sane/*.{so,la},%{py_sitedir}/*.la} +%{__rm} $RPM_BUILD_ROOT{%{_libdir}/libhp*.{so,la},%{_libdir}/sane/*.{so,la},%{py_sitedir}/*.la} # handled by post script %{__rm} $RPM_BUILD_ROOT/etc/sane.d/dll.conf # junk diff --git a/pld-distro.patch b/pld-distro.patch index f4531dc..f63c306 100644 --- a/pld-distro.patch +++ b/pld-distro.patch @@ -1,17 +1,17 @@ ---- hplip-3.11.7/installer/distros.dat~ 2011-07-24 22:06:50.000000000 +0300 -+++ hplip-3.11.7/installer/distros.dat 2011-10-06 23:01:42.727409095 +0300 -@@ -91,7 +91,7 @@ +--- hplip-3.18.7/installer/distros.dat.orig 2018-07-15 22:08:17.000000000 +0200 ++++ hplip-3.18.7/installer/distros.dat 2018-08-31 16:24:23.832035335 +0200 +@@ -92,7 +92,7 @@ # **************************************** [distros] --distros=unknown,mepis,debian,suse,mandriva,fedora,redhat,rhel,slackware,gentoo,redflag,ubuntu,xandros,freebsd,linspire,ark,pclinuxos,centos,igos,linuxmint,linpus,gos,boss,lfs -+distros=unknown,mepis,debian,suse,mandriva,fedora,redhat,rhel,slackware,gentoo,redflag,ubuntu,xandros,freebsd,linspire,ark,pclinuxos,centos,igos,linuxmint,linpus,gos,boss,lfs,pld +-distros=unknown,mepis,debian,suse,mandriva,fedora,redhat,rhel,slackware,gentoo,redflag,ubuntu,xandros,freebsd,linspire,ark,pclinuxos,centos,igos,linuxmint,linpus,gos,boss,lfs,manjarolinux ++distros=unknown,mepis,debian,suse,mandriva,fedora,redhat,rhel,slackware,gentoo,redflag,ubuntu,xandros,freebsd,linspire,ark,pclinuxos,centos,igos,linuxmint,linpus,gos,boss,lfs,manjarolinux,pld # **************************************** -@@ -8468,3 +8468,131 @@ - [lfs:6:epm] - packages=epm +@@ -10795,3 +10795,131 @@ + packages=automake + + +# **************************************** @@ -52,7 +52,7 @@ +fix_ppd_symlink=0 +drv_dir=/usr/lib/cups/driver +ui_toolkit=qt4 -+foomatic_rip_hplip=1 ++native_cups=1 + +[pld:3:cups] +packages=cups,cups-client @@ -109,7 +109,7 @@ +[pld:3:python23] +packages=python + -+[pld:3:python2x] ++[pld:3:python2X] +packages=python + +[pld:3:reportlab] -- 2.44.0