From cb2b4b408a29bb543b202d3552abe1c906c50778 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 21 Feb 2013 00:57:16 +0100 Subject: [PATCH] Tighten subpackage deps Use %{?_isa} to make yum depsolver pick the right multilib package. --- evince.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/evince.spec b/evince.spec index 2c26f7f..e7fc3e3 100644 --- a/evince.spec +++ b/evince.spec @@ -6,7 +6,7 @@ Name: evince Version: 3.7.90 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Document viewer License: GPLv2+ and GPLv3+ and LGPLv2+ and MIT and Afmparse @@ -44,7 +44,7 @@ BuildRequires: djvulibre-devel # for the xps backend BuildRequires: libgxps-devel >= %{gxps_version} -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description 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 Summary: Support for developing backends for the evince document viewer Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel This package contains libraries and header files needed for evince @@ -78,7 +78,7 @@ backend development. %package dvi Summary: Evince backend for dvi files Group: Applications/Publishing -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: texlive-collection-fontsrecommended %description dvi @@ -88,7 +88,7 @@ This package contains a backend to let evince display dvi files. %package djvu Summary: Evince backend for djvu files Group: Applications/Publishing -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description djvu 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 Summary: Evince extension for nautilus Group: User Interface/Desktops -Requires: %{name} = %{version}-%{release} -Requires: nautilus +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: nautilus%{?_isa} %description nautilus 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 %changelog +* Thu Feb 21 2013 Kalev Lember - 3.7.90-2 +- Tighten subpackage deps + * Thu Feb 21 2013 Kalev Lember - 3.7.90-1 - Update to 3.7.90