|
@@ -2,8 +2,8 @@
|
|
|
Summary: HP printer drivers & utilities for Linux
|
|
|
Summary(ja): HP プリンタの Linux 向けドライバとユーティリティ
|
|
|
Name: hplip
|
|
|
-Version: 3.15.2
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 3.16.5
|
|
|
+Release: 1%{?_dist_release}
|
|
|
|
|
|
License: GPLv2+, MIT and BSD
|
|
|
Group: Applications/Publishing
|
|
@@ -11,36 +11,35 @@ URL: http://hplip.sourceforge.net/
|
|
|
|
|
|
Source0: http://downloads.sourceforge.net/sourceforge/hplip/hplip-%{version}.tar.gz
|
|
|
#Source1: hpcups-update-ppds.sh
|
|
|
-Source1: hplip.desktop.vine
|
|
|
Source2: copy-deviceids.py
|
|
|
+Source1000: hplip.desktop.vine
|
|
|
|
|
|
Patch1: hplip-pstotiff-is-rubbish.patch
|
|
|
-Patch2: hplip-strstr-const.patch
|
|
|
-Patch3: hplip-ui-optional.patch
|
|
|
-Patch4: hplip-no-asm.patch
|
|
|
-Patch5: hplip-deviceIDs-drv.patch
|
|
|
-Patch6: hplip-udev-rules.patch
|
|
|
-Patch7: hplip-retry-open.patch
|
|
|
-Patch8: hplip-snmp-quirks.patch
|
|
|
-Patch9: hplip-hpijs-marker-supply.patch
|
|
|
-Patch10: hplip-clear-old-state-reasons.patch
|
|
|
-Patch11: hplip-hpcups-sigpipe.patch
|
|
|
-Patch12: hplip-logdir.patch
|
|
|
-Patch13: hplip-bad-low-ink-warning.patch
|
|
|
-Patch14: hplip-deviceIDs-ppd.patch
|
|
|
-Patch15: hplip-ppd-ImageableArea.patch
|
|
|
-Patch16: hplip-scan-tmp.patch
|
|
|
-Patch17: hplip-log-stderr.patch
|
|
|
-Patch18: hplip-avahi-parsing.patch
|
|
|
-Patch19: hplip-reportlab.patch
|
|
|
-Patch20: hplip-dj990c-margin.patch
|
|
|
-Patch21: hplip-strncpy.patch
|
|
|
-Patch22: hplip-no-write-bytecode.patch
|
|
|
-Patch23: hplip-silence-ioerror.patch
|
|
|
+Patch2: hplip-strstr-const.patch
|
|
|
+Patch3: hplip-ui-optional.patch
|
|
|
+Patch4: hplip-no-asm.patch
|
|
|
+Patch5: hplip-deviceIDs-drv.patch
|
|
|
+Patch6: hplip-udev-rules.patch
|
|
|
+Patch7: hplip-retry-open.patch
|
|
|
+Patch8: hplip-snmp-quirks.patch
|
|
|
+Patch9: hplip-hpijs-marker-supply.patch
|
|
|
+Patch10: hplip-clear-old-state-reasons.patch
|
|
|
+Patch11: hplip-hpcups-sigpipe.patch
|
|
|
+Patch12: hplip-logdir.patch
|
|
|
+Patch13: hplip-bad-low-ink-warning.patch
|
|
|
+Patch14: hplip-deviceIDs-ppd.patch
|
|
|
+Patch15: hplip-ppd-ImageableArea.patch
|
|
|
+Patch16: hplip-scan-tmp.patch
|
|
|
+Patch17: hplip-log-stderr.patch
|
|
|
+Patch18: hplip-avahi-parsing.patch
|
|
|
+Patch20: hplip-dj990c-margin.patch
|
|
|
+Patch21: hplip-strncpy.patch
|
|
|
+Patch22: hplip-no-write-bytecode.patch
|
|
|
+Patch23: hplip-silence-ioerror.patch
|
|
|
|
|
|
# Vine Patches
|
|
|
Patch70: hplip-3.11.5-gksu.patch
|
|
|
-#Patch1: hplip-udev-rules.patch
|
|
|
+Patch80: hplip-3.16.5-hpijs.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
Requires: cups
|
|
@@ -143,7 +142,6 @@ HP インクジェット及びレーザープリンタ複合機のスキャナ
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
-#patch1 -p1 -b .udev-rules
|
|
|
|
|
|
# The pstotiff filter is rubbish so replace it (launchpad #528394).
|
|
|
%patch1 -p1 -b .pstotiff-is-rubbish
|
|
@@ -167,7 +165,6 @@ mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs}
|
|
|
prnt/drv/hpijs.drv.in.deviceIDs-drv-hpijs \
|
|
|
> prnt/drv/hpijs.drv.in
|
|
|
|
|
|
-# Don't add printer queue, just check plugin.
|
|
|
# Move udev rules from /etc/ to /usr/lib/ (bug #748208).
|
|
|
%patch6 -p1 -b .udev-rules
|
|
|
|
|
@@ -224,23 +221,22 @@ done
|
|
|
# Fix parsing of avahi-daemon output (bug #1096939).
|
|
|
%patch18 -p1 -b .parsing
|
|
|
|
|
|
-# Fixed version comparisons for x.y.z-style versions such as
|
|
|
-# reportlab (bug #1121433).
|
|
|
-%patch19 -p1 -b .reportlab
|
|
|
-
|
|
|
# Fixed left/right margins for HP DeskJet 990C (LP #1405212).
|
|
|
%patch20 -p1 -b .dj990c-margin
|
|
|
|
|
|
# Fixed uses of strncpy throughout.
|
|
|
%patch21 -p1 -b .strncpy
|
|
|
|
|
|
-# Don't try to write bytecode cache for hpfax backend (bug #1192761).
|
|
|
+# Don't try to write bytecode cache for hpfax backend (bug #1192761)
|
|
|
+# or hp-config_usb_printer (bug #1266903)
|
|
|
+# or hpps filter (bug #1241548).
|
|
|
%patch22 -p1 -b .no-write-bytecode
|
|
|
|
|
|
# Ignore IOError when logging output (bug #712537).
|
|
|
%patch23 -p1 -b .silence-ioerror
|
|
|
|
|
|
%patch70 -p1 -b .gksu
|
|
|
+%patch80 -p1 -b .hpijs
|
|
|
|
|
|
sed -i.duplex-constraints \
|
|
|
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
|
|
@@ -251,6 +247,8 @@ sed -i.duplex-constraints \
|
|
|
# sed -i.env-python -e 's,^#!/usr/bin/env python,#!%{__python3},'
|
|
|
|
|
|
%build
|
|
|
+touch NEWS README AUTHORS ChangeLog
|
|
|
+autoreconf -f -i
|
|
|
%configure \
|
|
|
--enable-scan-build --enable-gui-build --enable-fax-build \
|
|
|
--disable-foomatic-rip-hplip-install --enable-pp-build \
|
|
@@ -273,8 +271,9 @@ make
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
make install DESTDIR=$RPM_BUILD_ROOT rulesdir=/lib/udev/rules.d
|
|
|
|
|
|
-# Create /run/hplip
|
|
|
+# Create /run/hplip & /var/lib/hp
|
|
|
mkdir -p $RPM_BUILD_ROOT/run/hplip
|
|
|
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/hp
|
|
|
|
|
|
# install modified .desktop
|
|
|
#{__install} -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_datadir}/applications/hplip.desktop
|
|
@@ -309,7 +308,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/foomatic-rip \
|
|
|
$RPM_BUILD_ROOT%{_datadir}/ppd/HP/*.ppd
|
|
|
|
|
|
|
|
|
-cp -p %{SOURCE1} hplip.desktop
|
|
|
+cp -p %{SOURCE1000} hplip.desktop
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
|
|
|
sed -i -e '/^Categories=/d' hplip.desktop
|
|
|
# Encoding key is deprecated
|
|
@@ -467,6 +466,8 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%{_libdir}/libhpip.so.*
|
|
|
# The so symlink is required here (see bug #489059).
|
|
|
%{_libdir}/libhpmud.so*
|
|
|
+%{_libdir}/libhpdiscovery.so*
|
|
|
+%{_libdir}/libhpipp.so*
|
|
|
# Python extension
|
|
|
%{python_sitearch}/*
|
|
|
|
|
@@ -492,6 +493,12 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Jul 2 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.16.5-1
|
|
|
+- new upstream release.
|
|
|
+- dropped all patches.
|
|
|
+- imported all patches from rawhide.
|
|
|
+- added Patch80 to fix error in building hpijs.
|
|
|
+
|
|
|
* Sun May 15 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.15.2-2
|
|
|
- rebuild with openssl-1.0.2
|
|
|
|