- added desktop patch

[packages/balsa.git] / balsa.spec

diff --git a/balsa.spec b/balsa.spec
index 0554c037bc775a1de2c29bfe6c877480684b4be8..fbccbf00c8043a018ad562f767a967a7433a05e6 100644 (file)
--- a/balsa.spec
+++ b/balsa.spec
@@ -10,23 +10,24 @@ Summary(es):        Balsa es un lector de e-mail
 Summary(pl):   Balsa - klient poczty
 Summary(pt_BR):        Balsa é um leitor de e-mail
 Name:          balsa
-Version:       2.2.6
+Version:       2.3.2
 Release:       2
 License:       GPL
 Group:         X11/Applications
 Source0:       http://balsa.gnome.org/%{name}-%{version}.tar.bz2
-# Source0-md5: 6179fadbfc5cca642dac081519acef25
+# Source0-md5: ab4d6febaca56d72d13acef819da193b
 Patch0:                %{name}-locale-names.patch
-#Patch1:               %{name}-desktop.patch
-Patch2:                %{name}-iconv-in-libc.patch
+Patch1:                %{name}-desktop.patch
+Patch2:                %{name}-includes.patch
 URL:           http://balsa.gnome.org/
-BuildRequires: aspell-devel >= 0.50
+BuildRequires: aspell-devel >= 2:0.50
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 %{?with_esmtp:BuildRequires:   libesmtp-devel}
 BuildRequires: libgnomeprintui-devel >= 1.106.0
+BuildRequires: glib2-devel >= 2.6.4-1
 BuildRequires: gmime-devel >= 2.1.9
-%{?with_gpgme:BuildRequires:   gpgme-devel >= 0.4.3}
+%{?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}
@@ -37,8 +38,10 @@ BuildRequires:       libtool
 %{?with_ldap:BuildRequires:    openldap-devel}
 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
@@ -61,13 +64,14 @@ Suporta caixas de correio locais, POP3 a IMAP.
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
+%%patch1 -p1
 %patch2 -p1
 
-mv -f po/{no,nb}.po
+rm -f po/no.{po,gmo}
 
 %build
-intltoolize --copy --force
+%{__intltoolize}
+%{__glib_gettextize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -79,7 +83,6 @@ intltoolize --copy --force
        %{!?with_gtkhtml:--disable-gtkhtml}\
        %{?with_gpgme:--with-gpgme} \
        %{?with_ldap:--with-ldap}
-
 %{__make}
 
 %install
@@ -93,7 +96,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)
@@ -108,3 +115,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_omf_dest_dir}/%{name}
 %{_desktopdir}/*
 %{_pixmapsdir}/*
+%{_iconsdir}/hicolor/48x48/mimetypes/*.png