commit 215a0dee2167e97b17efa31d6984e0719bb7c2f9
Author: Jakub Bogusz <[email protected]>
Date: Wed Feb 24 17:38:48 2016 +0100
- updated to 3.16.2
- updated unresolved,udev-rules patches
hplip-udev-rules.patch | 19 +++++++++----------
hplip.spec | 16 +++++++++++-----
unresolved.patch | 26 ++++++++++++++++++--------
3 files changed, 38 insertions(+), 23 deletions(-)
---
diff --git a/hplip.spec b/hplip.spec
index 6d9e058..078c5f9 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.14.4
+Version: 3.16.2
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: 6e8d53fb2284271505d2e1706c01f6c5
+# Source0-md5: e024f3b52b3b5be66da843fba7da4cf5
Patch0: %{name}-desktop.patch
Patch1: unresolved.patch
Patch2: pld-distro.patch
@@ -168,7 +168,9 @@ urządzenia HP AiO.
#%patch3 -p1
%patch5 -p1
-%{__sed} -i -e's,^#!/usr/bin/env python$,#!/usr/bin/python,' *.py
+%{__sed} -i -e '1s,^#!/usr/bin/env python$,#!%{__python},' *.py
fax/filters/pstotiff prnt/filters/hpps
+find base fax installer prnt scan ui ui4 -name '*.py' | xargs \
+ %{__sed} -i -e '1s,^#!/usr/bin/env python$,#!%{__python},'
%{__sed} -i -e 's#test -d /usr/share/polkit-1#true#' configure.in
%build
@@ -219,10 +221,10 @@ ln -s %{cups_filterdir}/foomatic-rip
$RPM_BUILD_ROOT%{cups_filterdir}/foomatic-r
%{__rm} $RPM_BUILD_ROOT/etc/sane.d/dll.conf
# junk
%{__rm}
$RPM_BUILD_ROOT{%{_bindir}/hp-{uninstall,upgrade},%{_datadir}/hplip/{uninstall,upgrade}.py}
-%{__rm} $RPM_BUILD_ROOT/usr/%{systemdunitdir}/[email protected]
+%{__rm} $RPM_BUILD_ROOT/usr/lib/systemd/system/[email protected]
%if %{without fax}
-rm $RPM_BUILD_ROOT%{cups_filterdir}/pstotiff
+%{__rm} $RPM_BUILD_ROOT%{cups_filterdir}/pstotiff
%endif
# use udev, hal's dead
@@ -361,8 +363,12 @@ fi
%files libs
%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libhpdiscovery.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libhpdiscovery.so.0
%attr(755,root,root) %{_libdir}/libhpip.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libhpip.so.0
+%attr(755,root,root) %{_libdir}/libhpipp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libhpipp.so.0
%attr(755,root,root) %{_libdir}/libhpmud.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libhpmud.so.0
diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch
index 7d2e5e4..9672e4d 100644
--- a/hplip-udev-rules.patch
+++ b/hplip-udev-rules.patch
@@ -1,14 +1,13 @@
---- hplip-3.14.4/data/rules/56-hpmud.rules.orig 2014-05-27
15:39:55.510795837 +0200
-+++ hplip-3.14.4/data/rules/56-hpmud.rules 2014-05-27 15:42:45.834125604
+0200
-@@ -11,8 +11,6 @@ LABEL="hpmud_usb_rules"
- ATTR{idVendor}=="03f0", ATTR{idProduct}=="????", OWNER="root", GROUP="lp",
MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes",
ENV{hp_test}="yes", ENV{ID_HPLIP}="1"
+--- hplip-3.16.2/data/rules/56-hpmud.rules.orig 2016-02-22
17:40:19.056836902 +0100
++++ hplip-3.16.2/data/rules/56-hpmud.rules 2016-02-22 17:41:52.463499649
+0100
+@@ -12,7 +12,4 @@
+ # ENV{ID_HPLIP}="1" is for Ubuntu udev-acl
+ ATTR{idVendor}=="03f0", ENV{ID_USB_INTERFACES}=="*:0701??:*|*:08????:",
OWNER="root", GROUP="lp", MODE="0664", ENV{libsane_matched}="yes",
ENV{hp_test}="yes", ENV{ID_HPLIP}="1"
-
--# This rule will add the printer and install plugin
--ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP
Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c 'if [ -f
/usr/bin/systemctl ]; then /usr/bin/systemctl --no-block start
hplip-printer@$env{BUSNUM}:$env{DEVNUM}.service; else /usr/bin/nohup
/usr/bin/python /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM} ; fi
&'"
-
- # If sane-bankends is installed add hpaio backend support to dll.conf if
needed.
- ENV{sane_hpaio}=="yes", RUN+="/bin/sh -c 'grep -q ^#hpaio
/etc/sane.d/dll.conf;if [ $$? -eq 0 ];then sed -i -e s/^#hpaio/hpaio/
/etc/sane.d/dll.conf;else grep -q ^hpaio /etc/sane.d/dll.conf;if [ $$? -ne 0
];then echo hpaio >>/etc/sane.d/dll.conf;fi;fi'"
+-# This rule will check the smart install feature, plugin status and firmware
download for the required printers.
+-ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP
Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/nohup
/usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM}'"
+-
+ LABEL="hpmud_rules_end"
diff -up hplip-3.13.6/Makefile.am.udev-rules hplip-3.13.6/Makefile.am
--- hplip-3.13.6/Makefile.am.udev-rules 2013-06-24 10:28:19.868301356
+0200
+++ hplip-3.13.6/Makefile.am 2013-06-24 10:32:21.272134161 +0200
diff --git a/unresolved.patch b/unresolved.patch
index 46e6f58..6093f46 100644
--- a/unresolved.patch
+++ b/unresolved.patch
@@ -9,15 +9,25 @@
return;
}
---- hplip-3.10.9/Makefile.am.wiget 2010-11-07 18:02:32.254945320 +0100
-+++ hplip-3.10.9/Makefile.am 2010-11-07 18:03:03.497071268 +0100
-@@ -56,7 +56,7 @@
+--- hplip-3.16.2/Makefile.am.orig 2016-02-22 17:38:26.050174980 +0100
++++ hplip-3.16.2/Makefile.am 2016-02-22 17:39:36.503505355 +0100
+@@ -60,7 +60,7 @@
libsane_hpaio_la_LDFLAGS = -version-info 1:0:0
endif
# The following is a interlibrary dependency that must be compiled first.
--libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -ldl
-+libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -ldl -lc
+-libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la libhpipp.la $(DBUS_LIBS)
-lcups -ldl
++libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la libhpipp.la $(DBUS_LIBS)
-lcups -ldl -lc
#libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
- libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS)
- endif # SCAN_BUILD
-
+ libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) -Iprotocol
+
+--- hplip-3.16.2/Makefile.am.orig 2016-02-22 18:12:48.406755100 +0100
++++ hplip-3.16.2/Makefile.am 2016-02-23 21:07:09.809356876 +0100
+@@ -288,7 +288,7 @@
+ libhpipp_la_SOURCES = protocol/hp_ipp.c protocol/hp_ipp.h protocol/hp_ipp_i.h
+ libhpipp_la_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
+ libhpipp_la_LDFLAGS = -version-info 0:1:0
+-libhpipp_la_LIBADD = libhpmud.la
++libhpipp_la_LIBADD = libhpmud.la -lcups
+
+
+ # cupsext
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hplip.git/commitdiff/215a0dee2167e97b17efa31d6984e0719bb7c2f9
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
