rpms/epiphany-extensions/devel epiphany-extensions.spec,1.26,1.27

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5781/devel

Modified Files:
	epiphany-extensions.spec 
Log Message:
* Wed Jun 06 2007 Christopher Aillon <caillon at redhat.com> - 2.18.2-3
- Specfiles should _NOT_ call rpm directly.  Fix the previous bug the
  correct way, by doing explicit requires on the exact versions instead
  of via rpm -q



Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- epiphany-extensions.spec	6 Jun 2007 03:57:36 -0000	1.26
+++ epiphany-extensions.spec	6 Jun 2007 05:30:09 -0000	1.27
@@ -1,9 +1,10 @@
-%global	ephy_major		2.19
-%global	ephy_min_version	%{ephy_major}.0
+%define	ephy_major		2.18
+%define	ephy_min_version	%{ephy_major}.0
+%define gecko_version		1.8.1.4
 
 Name:		epiphany-extensions
 Version:	%{ephy_major}.2
-Release:	2
+Release:	3
 Summary:	Extensions for Epiphany, the GNOME web browser
 
 License:	GPL
@@ -19,9 +20,13 @@
 BuildRequires:	gettext
 BuildRequires:	opensp-devel
 BuildRequires:	pcre-devel
+# gecko-devel is not strictly required, as epiphany-devel pulls it in.
+# BuildRequire it anyway so we fail if not building against the version
+# we are expecting to.
+BuildRequires:  gecko-devel = %{gecko_version}
 
 Requires:	epiphany >= %{ephy_min_version}
-Requires:	firefox = %(rpm -q firefox-devel --qf '%%{version}.%{_target_cpu}' 2>/dev/null)
+Requires:	gecko-libs = %{gecko_version}
 
 Requires(pre):	GConf2
 
@@ -100,16 +105,21 @@
 
 
 %changelog
-* Tue Jun 05 2007 Peter Gordon <peter at thecodergeek.com> - 2.19.2-2
+* Wed Jun 06 2007 Christopher Aillon <caillon at redhat.com> - 2.18.2-3
+- Specfiles should _NOT_ call rpm directly.  Fix the previous bug the
+  correct way, by doing explicit requires on the exact versions instead
+  of via rpm -q
+
+* 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.19.2-1
-- Update to new upstream release (2.19.2); and rebuild for newer Firefox/Gecko
-  version (2.0.0.4).
+* 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).
 
 * Wed Apr 11 2007 Peter Gordon <peter at thecodergeek.com> - 2.18.1-1
 - Update to new upstream release (2.18.1).