- build balsa without id lang; msgfmt id.po throws:

[packages/balsa.git] / balsa.spec

diff --git a/balsa.spec b/balsa.spec
index 2d9391ba396001e4af28dc5aa65513ca7b1d6e6d..21f63a4d385fc51670fcc5cf16ae841eb76e2588 100644 (file)
--- a/balsa.spec
+++ b/balsa.spec
@@ -6,39 +6,45 @@
 %bcond_without gtkhtml         # build without HTML support
 #
 Summary:       Balsa Mail Client
-Summary(es):   Balsa es un lector de e-mail
-Summary(pl):   Balsa - klient poczty
-Summary(pt_BR):        Balsa é um leitor de e-mail
+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.2.2
-Release:       1
+Version:       2.3.5
+Release:       2
 License:       GPL
 Group:         X11/Applications
 Source0:       http://balsa.gnome.org/%{name}-%{version}.tar.bz2
-# Source0-md5: 4e76f41f5816f1c677e252313b432fa0
+# Source0-md5: ccc5f1f11028dd604c6dac97017a1274
 Patch0:                %{name}-locale-names.patch
-#Patch1:               %{name}-desktop.patch
-Patch2:                %{name}-iconv-in-libc.patch
+Patch1:                %{name}-desktop.patch
+Patch2:                %{name}-includes.patch
+Patch3:                %{name}-no_hooks.patch
 URL:           http://balsa.gnome.org/
-BuildRequires: aspell-devel >= 0.50
+BuildRequires: ORBit2-devel >= 1:2.12.4
+BuildRequires: aspell-devel >= 2:0.50
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
+BuildRequires: heimdal-devel
 %{?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: glib2-devel >= 2.6.4-1
+BuildRequires: gmime-devel >= 2.1.9
+%{?with_gpgme:BuildRequires:   gpgme-devel >= 1:0.9.0}
+BuildRequires: gtk+2-devel >= 2:2.2.0
 BuildRequires: intltool
 %{?with_gtkhtml:BuildRequires: libgtkhtml-devel >= 2.0}
 BuildRequires: libltdl-devel
 BuildRequires: libgnomeprintui-devel >= 2.1.4
 BuildRequires: libgnomeui-devel >= 2.3.3.1-2
 BuildRequires: libtool
-%{?with_ldap:BuildRequires:    openldap-devel}
+%{?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
-%{?with_gpgme:Requires:        gpgme >= 0.9.0}
+%{?with_gpgme:Requires:        gpgme >= 1:0.9.0}
+Requires(post,postun): scrollkeeper
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -46,40 +52,42 @@ 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
+%description -l es.UTF-8
 Balsa es un lector de e-mail. Es parte del entorno GNOME. Soporta
-cajas de correo electrónico locales, POP3 y IMAP.
+cajas de correo electrónico locales, POP3 y IMAP.
 
-%description -l pl
-Balsa to klient e-mail. Jest czê¶ci± ¶rodowiska GNOME. Obs³uguje POP3,
+%description -l pl.UTF-8
+Balsa to klient e-mail. Jest częścią środowiska GNOME. Obsługuje POP3,
 IMAP oraz lokalne skrzynki pocztowe. 
 
-%description -l pt_BR
-Balsa é um leitor de e-mail, parte do ambiente de desktop GNOME.
+%description -l pt_BR.UTF-8
+Balsa é um leitor de e-mail, parte do ambiente de desktop GNOME.
 Suporta caixas de correio locais, POP3 a IMAP.
 
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
+%patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
-mv -f po/{no,nb}.po
+rm -f po/no.{po,gmo}
 
 %build
-intltoolize --copy --force
+%{__intltoolize}
+%{__glib_gettextize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__autoconf}
 %configure \
+       --with-gss \
        --with-ssl \
        %{!?with_esmtp:--without-esmtp} \
        %{!?with_gtkhtml:--disable-gtkhtml}\
        %{?with_gpgme:--with-gpgme} \
        %{?with_ldap:--with-ldap}
-
 %{__make}
 
 %install
@@ -93,7 +101,11 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /usr/bin/scrollkeeper-update
+%post
+%scrollkeeper_update_post
+
+%postun
+%scrollkeeper_update_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -106,5 +118,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/idl/*.idl
 %{_mandir}/man1/*
 %{_omf_dest_dir}/%{name}
-%{_desktopdir}/*
+%{_desktopdir}/*.desktop
 %{_pixmapsdir}/*
+%{_iconsdir}/hicolor/48x48/mimetypes/*.png