- updated gettext BR

[packages/balsa.git] / balsa.spec

diff --git a/balsa.spec b/balsa.spec
index 708ec0af3e4f827487dda23392ec9fc52fc315d8..6cb60c62d2d47ee9e186c7b3f5692ddcf8fcd860 100644 (file)
--- a/balsa.spec
+++ b/balsa.spec
@@ -1,31 +1,28 @@
 # TODO:
-#       - not packaged /usr/share/locale/ar/LC_MESSAGES/balsa.mo
-#       - problems with id locale
-#      - fix that: 
-#      Gtk-ERROR **: GTK+ 2.x symbols detected. Using GTK+ 2.x and GTK+ 3 in the same process is not supported
+# - use webkit as html widget?
 #
 # Conditional build:
 %bcond_without ldap            # build without LDAP support
 %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_without gtkhtml2        # build with libgtkhtml-2 (default gtkhtml-4)
 %bcond_with    compface        # build with Compface
 %bcond_with    gtksourceview   # build with GtkSourceView
 %bcond_without gtkspell        # build without GtkSpell
 %bcond_with    sqlite          # build with SQLite for GPE address books
-#
+
 Summary:       Balsa Mail Client
 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.4.9
-Release:       0.1
+Version:       2.4.10
+Release:       2
 License:       GPL v3+
 Group:         X11/Applications
 Source0:       http://pawsa.fedorapeople.org/balsa/%{name}-%{version}.tar.bz2
-# Source0-md5: bd7ac44f0cf3117a5fdb46d17dac2b51
+# Source0-md5: fa2b7cb9d248912ac2e3dcc08cd6aa5b
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-gtkhtml4.patch
 URL:           http://balsa.gnome.org/
@@ -35,10 +32,11 @@ BuildRequires:      autoconf >= 2.52
 BuildRequires: automake
 %{?with_compface:BuildRequires:        compface-devel}
 BuildRequires: docbook-dtd412-xml
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
 BuildRequires: glib2-devel >= 2.6.4-1
 BuildRequires: gmime-devel >= 2.4.0
 BuildRequires: gnome-doc-utils
+BuildRequires: gnome-icon-theme
 %{?with_gpgme:BuildRequires:   gpgme-devel >= 1:0.9.0}
 BuildRequires: gtk+2-devel >= 2:2.10.0
 %{?with_gtksourceview:BuildRequires:   gtksourceview-devel}
@@ -47,7 +45,7 @@ BuildRequires:        heimdal-devel
 BuildRequires: intltool
 %{?with_esmtp:BuildRequires:   libesmtp-devel >= 1.0.4}
 %if %{with gtkhtml}
-%{!?with_gtkhtml2:BuildRequires:       gtkhtml-devel >= 3.14}
+%{!?with_gtkhtml2:BuildRequires:       gtkhtml-devel >= 4.0}
 %{?with_gtkhtml2:BuildRequires:        libgtkhtml-devel >= 2.0}
 %endif
 BuildRequires: libgnomeui-devel >= 2.3.3.1-2
@@ -70,9 +68,8 @@ Conflicts:    glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Balsa is an e-mail reader.  This client is part of the GNOME
-desktop environment.  It supports local mailboxes, POP3 and
-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 es.UTF-8
 Balsa es un lector de e-mail. Es parte del entorno GNOME. Soporta
@@ -89,7 +86,7 @@ Suporta caixas de correio locais, POP3 a IMAP.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+%{!?with_gtkhtml2:%patch1 -p1}
 
 %build
 %{__libtoolize}
@@ -101,9 +98,13 @@ Suporta caixas de correio locais, POP3 a IMAP.
        --with-gss \
        --with-ssl \
        --with-unique \
+       --disable-silent-rules \
        %{!?with_esmtp:--without-esmtp} \
-       %{!?with_gtkhtml:--disable-gtkhtml}\
-       %{?with_gtkhtml2:--with-gtkhtml=2}\
+%if %{with gtkhtml}
+       --with-html-widget=%{?with_gtkhtml2:gtkhtml2}%{!?with_gtkhtml2:gtkhtml4} \
+%else
+       --disable-gtkhtml \
+%endif
        %{?with_gpgme:--with-gpgme} \
        %{?with_compface:--with-compface} \
        %{?with_gtksourceview:--with-gtksourceview} \
@@ -134,12 +135,14 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/*
-%{_sysconfdir}/sound/events/*
+%attr(755,root,root) %{_bindir}/balsa
+%attr(755,root,root) %{_bindir}/balsa-ab
+%dir %{_sysconfdir}/sound/events
+%{_sysconfdir}/sound/events/balsa.soundlist
 %{_datadir}/%{name}
 %{_datadir}/sounds/%{name}
-%{_mandir}/man1/*
+%{_mandir}/man1/balsa.1*
 %{_omf_dest_dir}/%{name}
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
+%{_desktopdir}/balsa.desktop
+%{_pixmapsdir}/gnome-balsa2.png
 %{_iconsdir}/hicolor/48x48/mimetypes/*.png