[pidgin/f14/master] fix explicit requires to be more explicit

Tom Callaway spot at fedoraproject.org
Mon Aug 23 18:05:33 UTC 2010


commit e92e0b82484c2dba2221075f11ff54b527ab284d
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Mon Aug 23 14:05:34 2010 -0400

    fix explicit requires to be more explicit

 pidgin.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/pidgin.spec b/pidgin.spec
index c297765..cb5a382 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -98,7 +98,7 @@
 
 Name:           pidgin
 Version:        2.7.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -145,7 +145,7 @@ Summary:        A Gtk+ based multiprotocol instant messaging client
 BuildRequires:  glib2-devel
 Requires:       glib2 >= %{glib_ver}
 # Require exact libpurple
-Requires:       libpurple = %{version}-%{release}
+Requires:       libpurple%{?_isa} = %{version}-%{release}
 
 Requires(pre):  GConf2
 Requires(post): GConf2
@@ -675,6 +675,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Aug 23 2010 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.3-2
+- use _isa in explicit Requires on libpurple to prevent yum from trying to 
+  jump architectures to resolve dependency
+
 * Wed Aug 11 2010 Stu Tomlinson <stu at nosnilmot.com> 2.7.3-1
 - 2.7.3
 


More information about the scm-commits mailing list