diff --git a/balsa-gtkhtml3.patch b/balsa-gtkhtml3.patch new file mode 100644 index 0000000..4ca307f --- /dev/null +++ b/balsa-gtkhtml3.patch @@ -0,0 +1,15 @@ +diff --git a/configure.in b/configure.in +index fd4ff96..df3864b 100644 +--- a/configure.in ++++ b/configure.in +@@ -403,7 +403,9 @@ case "$use_html_widget" in + ;; + gtkhtml3) + AC_MSG_RESULT([$use_html_widget]) +- PKG_CHECK_MODULES(HTML, [ libgtkhtml-3.14 ]) ++ PKG_CHECK_MODULES(HTML, [ libgtkhtml-3.14 ], [], ++ [PKG_CHECK_MODULES(HTML, [ libgtkhtml-3.15 ],[], ++ [AC_MSG_ERROR([*** You enabled gtkhtml3 but none of 3.14 or 3.15 libversions were found.])])]) + AC_DEFINE(HAVE_GTKHTML3,1,[Defined when GtkHtml-3 can be used.]) + ;; + webkit) diff --git a/balsa.spec b/balsa.spec index ffef5d7..1115372 100644 --- a/balsa.spec +++ b/balsa.spec @@ -2,13 +2,14 @@ Name: balsa Version: 2.4.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Mail Client Group: Applications/Internet License: GPLv2+ URL: http://pawsa.fedorapeople.org/balsa/ Source0: http://pawsa.fedorapeople.org/balsa/%{name}-%{version}.tar.bz2 +Patch1: balsa-gtkhtml3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libesmtp >= 1.0.4 @@ -33,7 +34,6 @@ BuildRequires: libtool BuildRequires: openssl-devel BuildRequires: scrollkeeper BuildRequires: unique-devel -BuildRequires: gnome-doc-utils %description Balsa is a GNOME email client which supports mbox, maildir, and mh @@ -46,10 +46,11 @@ and printing messages. %prep %setup -q +%patch1 -p1 %build -#autoreconf -f -i +autoreconf -f -i %configure %{config_opts} make %{?_smp_mflags} @@ -69,8 +70,6 @@ desktop-file-install $RPM_BUILD_ROOT%{_datadir}/applications/balsa.desktop \ %find_lang %{name} -find $RPM_BUILD_ROOT - %clean rm -rf "$RPM_BUILD_ROOT" @@ -109,7 +108,10 @@ fi %changelog -* Tue Dec 07 2010 Pawel Salek - 2.4.9-1 +* Tue Dec 28 2010 Pawel Salek - 2.4.9-3 +- rebuild against new gtk and gtkhtml. + +* Tue Dec 07 2010 Pawel Salek - 2.4.9-2 - rebuild against libesmtp-1.0.6 * Fri Nov 19 2010 Pawel Salek - 2.4.9-1