rpms/sane-backends
7
0
Fork 0
Code Issues Pull Requests Releases Activity

epoch is not defined by default, so remove it from conflicting NVR

Browse Source
This commit is contained in:
Zdenek Dohnal 2022-03-24 13:42:09 +01:00
parent 8403f40532
commit b1c65fdf2c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sane-backends.spec
View File

@ -14,7 +14,7 @@
Summary: Scanner access software Summary: Scanner access software
Name: sane-backends Name: sane-backends
Version: 1.1.1 Version: 1.1.1
Release: 4%{?dist} Release: 5%{?dist}
# lib/ is LGPLv2+, backends are GPLv2+ with exceptions # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
# Tools are GPLv2+, docs are public domain # Tools are GPLv2+, docs are public domain
# see LICENSE for details # see LICENSE for details
@ -131,7 +131,7 @@ Summary: SANE backend drivers for scanners
# pixma backend now requires libxml2 # pixma backend now requires libxml2
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
# due move of camera backends # due move of camera backends
Conflicts: %{name}-drivers-cameras < 1:1.1.1-4 Conflicts: %{name}-drivers-cameras < 1.1.1-4
Requires: sane-backends = %{?epoch:%{epoch}:}%{version}-%{release} Requires: sane-backends = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: sane-backends-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: sane-backends-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@ -141,7 +141,7 @@ This package contains backend drivers to access scanner hardware through SANE.
%package drivers-cameras %package drivers-cameras
Summary: Scanner backend drivers for digital cameras Summary: Scanner backend drivers for digital cameras
# due move of camera backends # due move of camera backends
Conflicts: %{name}-drivers-scanners < 1:1.1.1-4 Conflicts: %{name}-drivers-scanners < 1.1.1-4
Requires: sane-backends = %{?epoch:%{epoch}:}%{version}-%{release} Requires: sane-backends = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: sane-backends-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: sane-backends-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@ -450,6 +450,9 @@ exit 0
%{_unitdir}/saned@.service %{_unitdir}/saned@.service
%changelog %changelog
* Thu Mar 24 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1.1.1-5
- epoch is not defined by default, so remove it from conflicting NVR
* Wed Mar 23 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1.1.1-4 * Wed Mar 23 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1.1.1-4
- move the camera backends into its subpackage - move the camera backends into its subpackage