- up to version 2.2.0

Changed files:
    balsa.spec -> 1.118

diff --git a/balsa.spec b/balsa.spec
index 439043d4646e86184a47b8cde2ca76c7284417c0..c21b6c4b8529e9356a49a06cf5585546bdf2434f 100644 (file)
--- a/balsa.spec
+++ b/balsa.spec
@@ -5,19 +5,17 @@
 %bcond_without esmtp           # build without ESMTP support
 %bcond_without gtkhtml         # build without HTML support
 #
-Summary:       balsa - GNOME e-Mail program
-Summary(pl):   Klient poczty dla GNOME z silnikiem mutt-a
-Summary(es):   Balsa es un lector de e-mail. Usa el toolkit GTK
-Summary(pt_BR):        Balsa é um leitor de e-mail. Usa o toolkit GTK
+Summary:       Balsa Mail Client
+Summary(pl):   Balsa - klient poczty
 Name:          balsa
-Version:       2.0.17
-Release:       4
+Version:       2.2.0
+Release:       1
 License:       GPL
 Group:         X11/Applications
 Source0:       http://balsa.gnome.org/%{name}-%{version}.tar.bz2
-# Source0-md5: 851db68728ed9adea615eb2f249fa1ee
+# Source0-md5: 2bbe9e80fbdfbcf89f31fb7250445f85
 Patch0:                %{name}-locale-names.patch
-Patch1:                %{name}-desktop.patch
+#Patch1:               %{name}-desktop.patch
 Patch2:                %{name}-iconv-in-libc.patch
 URL:           http://balsa.gnome.org/
 BuildRequires: aspell-devel >= 0.50
@@ -25,12 +23,11 @@ BuildRequires:      autoconf >= 2.52
 BuildRequires: automake
 %{?with_esmtp:BuildRequires:   libesmtp-devel}
 BuildRequires: libgnomeprintui-devel >= 1.106.0
+BuildRequires: gmime-devel >= 2.1.7
 %{?with_gpgme:BuildRequires:   gpgme-devel >= 0.4.3}
 BuildRequires: gtk+2-devel >= 2.2.0
 BuildRequires: intltool
-# gtkhtml 3.0 is preferred over libgtkhtml-2* if present, but we have gtkhtml 3.1 now
 %{?with_gtkhtml:BuildRequires: libgtkhtml-devel >= 2.0}
-%{?with_gtkhtml:BuildConflicts:        gtkhtml-devel < 3.1}
 BuildRequires: libltdl-devel
 BuildRequires: libgnomeprintui-devel >= 2.1.4
 BuildRequires: libgnomeui-devel >= 2.3.3.1-2
@@ -39,34 +36,22 @@ BuildRequires:      libtool
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pcre-devel >= 3.0
 BuildRequires: scrollkeeper >= 0.1.4
-%{?with_gpgme:Requires:        gpgme >= 0.4.3}
+%{?with_gpgme:Requires:        gpgme >= 0.9.0}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-e-Mail program for the GNOME desktop, supporting local mailboxes, POP3
-and IMAP. GNOME is the GNU Network Object Model Environment. That's a
-fancy name but really GNOME is a nice GUI desktop environment. It
-makes using your computer easy, powerful, and easy to configure.
-
-%description -l es
-Balsa es un lector de e-mail. Es parte del entorno GNOME. Soporta
-cajas de correo electrónico locales, POP3 y IMAP.
+Balsa is an e-mail reader.  This client is part of the GNOME
+desktop environment.  It supports local mailboxes, POP3 and
+IMAP.
 
 %description -l pl
-Balsa to klient e-mail dla ¶rodowiska GNOME. Obs³uguje POP3, IMAP oraz
-lokalne skrzynki pocztowe. GNOME to Network Object Model Environment.
-Mimo osobliwej nazwy jest to naprawdê estetyczne ¶rodowisko graficzne.
-Dziêki niemu u¿ywanie komputera jest ³atwiejsze; system jest
-potê¿niejszy i ³atwo go skonfigurowaæ.
-
-%description -l pt_BR
-Balsa é um leitor de e-mail, parte do ambiente de desktop GNOME.
-Suporta caixas de correio locais, POP3 a IMAP.
+Balsa to klient e-mail. Jest czê¶ci± ¶rodowiska GNOME. Obs³uguje POP3, IMAP oraz
+lokalne skrzynki pocztowe. 
 
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 %patch2 -p1
 
 mv -f po/{no,nb}.po
@@ -81,11 +66,9 @@ intltoolize --copy --force
 %configure \
        --with-ssl \
        %{!?with_esmtp:--without-esmtp} \
-       %{?with_gtkhtml:--enable-gtkhtml} \
        %{!?with_gtkhtml:--disable-gtkhtml}\
-       %{!?with_gpgme:--without-gpgme} \
-       %{?with_ldap:--with-ldap} \
-       %{!?with_ldap:--without-ldap}
+       %{?with_gpgme:--with-gpgme} \
+       %{?with_ldap:--with-ldap}
 
 %{__make}