[gtk3] Tighten deps with the _isa macro

Kalev Lember kalev at fedoraproject.org
Mon Sep 22 11:30:24 UTC 2014


commit a7fa60e41151d320ac0265a2cec0a9a427f2a74c
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Mon Sep 22 13:16:26 2014 +0200

    Tighten deps with the _isa macro

 gtk3.spec |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/gtk3.spec b/gtk3.spec
index 673515e..513b3cb 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -64,13 +64,13 @@ Requires: adwaita-icon-theme
 Requires: hicolor-icon-theme
 
 # We need to prereq these so we can run gtk-query-immodules-3.0
-Requires(post): glib2 >= %{glib2_version}
-Requires(post): atk >= %{atk_version}
-Requires(post): pango >= %{pango_version}
+Requires(post): glib2%{?_isa} >= %{glib2_version}
+Requires(post): atk%{?_isa} >= %{atk_version}
+Requires(post): pango%{?_isa} >= %{pango_version}
 
 Requires: cairo%{?_isa} >= %{cairo_version}
 Requires: cairo-gobject%{?_isa} >= %{cairo_version}
-Requires: libXrandr >= %{xrandr_version}
+Requires: libXrandr%{?_isa} >= %{xrandr_version}
 
 # gtk3 itself includes the Adwaita theme now
 Obsoletes: adwaita-gtk3-theme < 3.13.3
@@ -92,7 +92,7 @@ Summary: Input methods for GTK+
 Group: System Environment/Libraries
 Requires: gtk3%{?_isa} = %{version}-%{release}
 # for im-cedilla.conf
-Requires: gtk2-immodules
+Requires: gtk2-immodules%{?_isa}
 
 %description immodules
 The gtk3-immodules package contains standalone input methods that
@@ -109,7 +109,7 @@ The gtk3-immodule-xim package contains XIM support for GTK+ 3.
 %package devel
 Summary: Development files for GTK+
 Group: Development/Libraries
-Requires: gtk3 = %{version}-%{release}
+Requires: gtk3%{?_isa} = %{version}-%{release}
 Requires: gdk-pixbuf2-devel
 Requires: libX11-devel, libXcursor-devel, libXinerama-devel
 Requires: libXext-devel, libXi-devel, libXrandr-devel
@@ -317,6 +317,7 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %changelog
 * Mon Sep 22 2014 Kalev Lember <kalevlember at gmail.com> - 3.14.0-1
 - Update to 3.14.0
+- Tighten deps with the _isa macro
 
 * Tue Sep 16 2014 Kalev Lember <kalevlember at gmail.com> - 3.13.9-1
 - Update to 3.13.9


More information about the scm-commits mailing list