diff --git a/hplip.spec b/hplip.spec index 6623526..b0894ee 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.12.11 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons @@ -49,8 +49,8 @@ Requires(preun): /sbin/service Requires(preun): /sbin/chkconfig %global hpijs_epoch 1 -Requires: hpijs = %{hpijs_epoch}:%{version}-%{release} -Requires: %{name}-libs = %{version}-%{release} +Requires: hpijs%{?_isa} = %{hpijs_epoch}:%{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: python-imaging Requires: cups Requires: wget @@ -104,8 +104,8 @@ Requires: python-reportlab Requires: pygobject2 Requires(post): desktop-file-utils >= 0.2.92 Requires(postun): desktop-file-utils >= 0.2.92 -Requires: %{name} = %{version}-%{release} -Requires: libsane-hpaio = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: libsane-hpaio%{?_isa} = %{version}-%{release} %description gui HPLIP graphical tools. @@ -115,7 +115,7 @@ Summary: HP Printer Drivers Group: Applications/Publishing License: BSD Epoch: %{hpijs_epoch} -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: cups >= 1:1.4 %description -n hpijs @@ -131,7 +131,7 @@ License: GPLv2+ Obsoletes: libsane-hpoj < 0.91 Provides: libsane-hpoj = 0.91 Requires: sane-backends -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description -n libsane-hpaio SANE driver for scanners in HP's multi-function devices (from HPOJ). @@ -532,6 +532,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %postun libs -p /sbin/ldconfig %changelog +* Fri Jan 18 2013 Jiri Popelka 3.12.11-5 +- Use arch-specific dependencies. + * Wed Jan 16 2013 Jiri Popelka 3.12.11-4 - hpijs no longer requires net-snmp (bug #376641, bug #895643).