diff --git a/hplip.spec b/hplip.spec index 6d4e3e6..5383200 100644 --- a/hplip.spec +++ b/hplip.spec @@ -7,7 +7,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.18.12 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ and MIT and BSD and IJG and Public Domain and GPLv2+ with exceptions and ISC Url: https://developers.hp.com/hp-linux-imaging-and-printing @@ -154,10 +154,6 @@ BuildRequires: python3-cups # macros: %%{_tmpfilesdir}, %%{_udevrulesdir} BuildRequires: systemd -# hpijs was merged into main package in 3.15.7-2 -Obsoletes: hpijs < 1:%{version}-%{release} -Provides: hpijs = 1:%{version}-%{release} - %description The Hewlett-Packard Linux Imaging and Printing Project provides drivers for HP printers and multi-function peripherals. @@ -174,7 +170,6 @@ Summary: HPLIP libraries License: GPLv2+ and MIT Requires: %{name}-common%{?_isa} = %{version}-%{release} Requires: python3 -Obsoletes: %{name}-compat-libs < %{version}-%{release} %description libs Libraries needed by HPLIP. @@ -196,8 +191,6 @@ HPLIP graphical tools. %package -n libsane-hpaio Summary: SANE driver for scanners in HP's multi-function devices License: GPLv2+ -Obsoletes: libsane-hpoj < 0.91 -Provides: libsane-hpoj = 0.91 Requires: sane-backends Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -670,6 +663,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio %changelog +* Tue Jul 09 2019 Zdenek Dohnal - 3.18.12-14 +- remove old obsoletes and provides for hpijs, libsane-hpoj and hplip-compat-libs + * Wed Jun 26 2019 Zdenek Dohnal - 3.18.12-13 - fix #1722222 without downstream patch, just call desktop-install-file with other parameters