rpms/epiphany-extensions/F-7 epiphany-extensions.spec,1.25,1.26

Peter Gordon (pgordon) fedora-extras-commits at redhat.com
Wed Jun 6 03:58:06 UTC 2007


Author: pgordon

Update of /cvs/extras/rpms/epiphany-extensions/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12305/F-7

Modified Files:
	epiphany-extensions.spec 
Log Message:
Fix bug 242318 by adding target CPU to the Firefox version dependency.


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/F-7/epiphany-extensions.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- epiphany-extensions.spec	2 Jun 2007 04:00:08 -0000	1.25
+++ epiphany-extensions.spec	6 Jun 2007 03:57:15 -0000	1.26
@@ -3,7 +3,7 @@
 
 Name:		epiphany-extensions
 Version:	%{ephy_major}.2
-Release:	1
+Release:	2
 Summary:	Extensions for Epiphany, the GNOME web browser
 
 License:	GPL
@@ -21,7 +21,7 @@
 BuildRequires:	pcre-devel
 
 Requires:	epiphany >= %{ephy_min_version}
-Requires:	firefox = %(rpm -q firefox-devel --qf '%%{version}' 2>/dev/null)
+Requires:	firefox = %(rpm -q firefox-devel --qf '%%{version}.%{_target_cpu}' 2>/dev/null)
 
 Requires(pre):	GConf2
 
@@ -100,6 +100,13 @@
 
 
 %changelog
+* Tue Jun 05 2007 Peter Gordon <peter at thecodergeek.com> - 2.18.2-2
+- Add %%{_target_cpu} to versioned Firefox dependency to avoid multilib
+  updating issues such as bug 242318, wherein the 32-bit older Firefox build
+  matches the versioned dependency, but the updated 64-bit Firefox build
+  matches the 64-bit shared library dependencies. (Thanks to Frederik Hertzum
+  for the bug report.) 
+
 * Tue May 30 2007 Peter Gordon <peter at thecodergeek.com> - 2.18.2-1
 - Update to new upstream bugfix release (2.18.2); and rebuild for newer
   Firefox/Gecko version (2.0.0.4).




More information about the fedora-extras-commits mailing list