- ver. 2.3.20 (NFY)

[packages/balsa.git] / balsa.spec

diff --git a/balsa.spec b/balsa.spec
index cfa126ff9feeb15bafc1de72baf93a1d572a8cc2..0ea94b2211231a8f802a23e33f8fad25934309cb 100644 (file)
--- a/balsa.spec
+++ b/balsa.spec
@@ -1,5 +1,4 @@
 # TODO:
-#       - lots files listed twice
 #       - not packaged /usr/share/locale/ar/LC_MESSAGES/balsa.mo
 #       - problems with id locale
 #
@@ -8,9 +7,10 @@
 %bcond_with    gpgme           # build with GPG support (experimental)
 %bcond_without esmtp           # build without ESMTP support
 %bcond_without gtkhtml         # build without HTML support
+%bcond_with    gtkhtml2        # build with libgtkhtml-2 (default gtkhtml-3)
 %bcond_with    compface        # build with Compface
 %bcond_with    gtksourceview   # build with GtkSourceView
-%bcond_with    gtkspell        # build with GtkSpell
+%bcond_without gtkspell        # build without GtkSpell
 %bcond_with    sqlite          # build with SQLite for GPE address books
 #
 Summary:       Balsa Mail Client
@@ -18,12 +18,12 @@ Summary(es.UTF-8):  Balsa es un lector de e-mail
 Summary(pl.UTF-8):     Balsa - klient poczty
 Summary(pt_BR.UTF-8):  Balsa é um leitor de e-mail
 Name:          balsa
-Version:       2.3.14
+Version:       2.3.20
 Release:       0.1
 License:       GPL
 Group:         X11/Applications
 Source0:       http://balsa.gnome.org/%{name}-%{version}.tar.bz2
-# Source0-md5: 6a86f8bebc21bd279b9fd4d2a21a36c0
+# Source0-md5: 64763beb79731649da7e327b1140843a
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-includes.patch
 Patch2:                %{name}-without_id_lang.patch
@@ -33,9 +33,6 @@ BuildRequires:        aspell-devel >= 2:0.50
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 %{?with_compface:BuildRequires:        compface-devel}
-BuildRequires: heimdal-devel
-%{?with_esmtp:BuildRequires:   libesmtp-devel >= 1.0.4}
-BuildRequires: libgnomeprintui-devel >= 1.106.0
 BuildRequires: glib2-devel >= 2.6.4-1
 BuildRequires: gmime-devel >= 2.1.9
 %{?with_gpgme:BuildRequires:   gpgme-devel >= 1:0.9.0}
@@ -43,16 +40,23 @@ BuildRequires:      gtk+2-devel >= 2:2.2.0
 %{?with_gtksourceview:BuildRequires:   gtksourceview-devel}
 %{?with_gtkspell:BuildRequires:        gtkspell-devel}
 BuildRequires: intltool
-%{?with_gtkhtml:BuildRequires: libgtkhtml-devel >= 2.0}
-BuildRequires: libltdl-devel
+BuildRequires: krb5-devel
+%{?with_esmtp:BuildRequires:   libesmtp-devel >= 1.0.4}
+%if %{with gtkhtml}
+%{?with_gtkhtml2:BuildRequires:        libgtkhtml-devel >= 2.0}
+%{!?with_gtkhtml2:BuildRequires:       gtkhtml-devel >= 3.0}
+%endif
 BuildRequires: libgnomeprintui-devel >= 2.1.4
 BuildRequires: libgnomeui-devel >= 2.3.3.1-2
+BuildRequires: libltdl-devel
 BuildRequires: libtool
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pcre-devel >= 3.0
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: scrollkeeper >= 0.1.4
+# actually, it requires sqlite >= 2.8
+%{?with_sqlite:BuildRequires:  sqlite3-devel}
 %{?with_gpgme:Requires:        gpgme >= 1:0.9.0}
 Requires(post,postun): scrollkeeper
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -93,6 +97,7 @@ Suporta caixas de correio locais, POP3 a IMAP.
        --with-ssl \
        %{!?with_esmtp:--without-esmtp} \
        %{!?with_gtkhtml:--disable-gtkhtml}\
+       %{?with_gtkhtml2:--with-gtkhtml=2}\
        %{?with_gpgme:--with-gpgme} \
        %{?with_compface:--with-compface} \
        %{?with_gtksourceview:--with-gtksourceview} \