rpms/blam/devel blam.spec,1.11,1.12

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/extras/rpms/blam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16524

Modified Files:
	blam.spec 
Log Message:
Rebuild for Firefox 2.0.0.5


Index: blam.spec
===================================================================
RCS file: /cvs/extras/rpms/blam/devel/blam.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- blam.spec	31 May 2007 06:05:57 -0000	1.11
+++ blam.spec	19 Jul 2007 00:02:57 -0000	1.12
@@ -1,10 +1,11 @@
-## Hopefully Mono and multilib will play nicely soon, but until then...
-%define	_libdir %{_prefix}/lib
-%define	dbus_sharp_min_version 0.60
+## XXX: Hopefully Mono, Blam and multilib will play nicely soon...
+%define	_libdir			%{_prefix}/lib
+%define	dbus_sharp_min_version	0.60
+%define	gecko_version		1.8.1.5
 
 Name:		blam
 Version:	1.8.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -20,21 +21,24 @@
 ## Various Mono dependencies are not available for ppc64; see bug 241850.
 ExcludeArch:	ppc64
 
-BuildRequires:	mono-devel
+## gecko-libs is not strictly required, as gecko-sharp2 should pull it in.
+## We hardcode a dependency for it anyway so that we fail if not building or
+## being installed against the version we are expecting to.
+BuildRequires:	dbus-sharp-devel >= %{dbus_sharp_min_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gecko-devel = %{gecko_version}
+BuildRequires:	gecko-sharp2-devel
+BuildRequires:	gettext
 BuildRequires:	gnome-sharp-devel
-BuildRequires:	gtk-sharp2-gapi
 BuildRequires:	gtk-sharp2-devel
-BuildRequires:	gecko-sharp2-devel
-BuildRequires:	gecko-devel
+BuildRequires:	gtk-sharp2-gapi
 BuildRequires:	libgnomeui-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:	mono-devel
 BuildRequires:	perl(XML::Parser)
-BuildRequires:	dbus-sharp-devel >= %{dbus_sharp_min_version}
 
 Requires:	dbus-sharp >= %{dbus_sharp_min_version}	
 Requires:	gecko-sharp2
-Requires:       firefox = %(rpm -q firefox-devel --qf '%%{version}' 2>/dev/null)
+Requires:	gecko-libs = %{gecko_version}
 
 Requires(pre):	GConf2
 
@@ -120,7 +124,14 @@
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Wed Jul 18 2007 Peter Gordon <peter at thecodergeek.com> - 1.8.3-5
+- Rebuild for newer Gecko libraries (Firefox 2.0.0.5)
+- Depend on the gecko-libs and gecko-devel virtuals, instead of querying RPM
+  at build-time (Thanks to Chris Aillon for the fix.)
+- Alphabetize dependencies, and other minor aesthetic-only spec changes.
+
 * Wed May 30 2007 Peter Gordon <peter at thecodergeek.com> - 1.8.3-4
+- Rebuild for newer Gecko libraries (Firefox 2.0.0.4)
 - Add a patch to fix the default theme directory search path to prevent crashes
   at startup (fixes bug 241465):
   + fix-THEME_DIR-path.patch