rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

remove old obsoletes and provides for hpijs, libsane-hpoj and hplip-compat-libs

Browse Source
This commit is contained in:
Zdenek Dohnal 2019-07-09 08:37:24 +02:00
parent a2eb0cb89a
commit bc50238496
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hplip.spec
View File

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