Tighten subpackage deps

Use %{?_isa} to make yum depsolver pick the right multilib package.
This commit is contained in:
Kalev Lember 2013-02-21 00:57:16 +01:00
parent 38c8aabbfd
commit cb2b4b408a

View File

@ -6,7 +6,7 @@
Name: evince Name: evince
Version: 3.7.90 Version: 3.7.90
Release: 1%{?dist} Release: 2%{?dist}
Summary: Document viewer Summary: Document viewer
License: GPLv2+ and GPLv3+ and LGPLv2+ and MIT and Afmparse License: GPLv2+ and GPLv3+ and LGPLv2+ and MIT and Afmparse
@ -44,7 +44,7 @@ BuildRequires: djvulibre-devel
# for the xps backend # for the xps backend
BuildRequires: libgxps-devel >= %{gxps_version} BuildRequires: libgxps-devel >= %{gxps_version}
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description %description
Evince is simple multi-page document viewer. It can display and print Evince is simple multi-page document viewer. It can display and print
@ -68,7 +68,7 @@ This package contains shared libraries needed for evince
%package devel %package devel
Summary: Support for developing backends for the evince document viewer Summary: Support for developing backends for the evince document viewer
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel %description devel
This package contains libraries and header files needed for evince This package contains libraries and header files needed for evince
@ -78,7 +78,7 @@ backend development.
%package dvi %package dvi
Summary: Evince backend for dvi files Summary: Evince backend for dvi files
Group: Applications/Publishing Group: Applications/Publishing
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: texlive-collection-fontsrecommended Requires: texlive-collection-fontsrecommended
%description dvi %description dvi
@ -88,7 +88,7 @@ This package contains a backend to let evince display dvi files.
%package djvu %package djvu
Summary: Evince backend for djvu files Summary: Evince backend for djvu files
Group: Applications/Publishing Group: Applications/Publishing
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description djvu %description djvu
This package contains a backend to let evince display djvu files. This package contains a backend to let evince display djvu files.
@ -97,8 +97,8 @@ This package contains a backend to let evince display djvu files.
%package nautilus %package nautilus
Summary: Evince extension for nautilus Summary: Evince extension for nautilus
Group: User Interface/Desktops Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: nautilus Requires: nautilus%{?_isa}
%description nautilus %description nautilus
This package contains the evince extension for the nautilus file manger. This package contains the evince extension for the nautilus file manger.
@ -220,6 +220,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null ||:
%{_libdir}/nautilus/extensions-3.0/libevince-properties-page.so %{_libdir}/nautilus/extensions-3.0/libevince-properties-page.so
%changelog %changelog
* Thu Feb 21 2013 Kalev Lember <kalevlember@gmail.com> - 3.7.90-2
- Tighten subpackage deps
* Thu Feb 21 2013 Kalev Lember <kalevlember@gmail.com> - 3.7.90-1 * Thu Feb 21 2013 Kalev Lember <kalevlember@gmail.com> - 3.7.90-1
- Update to 3.7.90 - Update to 3.7.90