From 594823835aabc0ce64ca9ce88e30e195f8e18dbc Mon Sep 17 00:00:00 2001 From: Peter Gordon Date: Jul 19 2007 00:02:57 +0000 Subject: Rebuild for Firefox 2.0.0.5 --- diff --git a/blam.spec b/blam.spec index da9527c..7c01db4 100644 --- a/blam.spec +++ b/blam.spec @@ -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 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## 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 @@ update-desktop-database &> /dev/null ||: %{_mandir}/man?/%{name}.1* %changelog +* Wed Jul 18 2007 Peter Gordon - 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 - 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