- added locale-names (no->nb) and iconv-in-libc (avoid -liconv) patches

- updated deps (note that this version uses gpgme >= 0.4.3, not 0.3.x)
- release 2

Changed files:
    balsa.spec -> 1.114

diff --git a/balsa.spec b/balsa.spec
index 23a5e719b1bb75c0d13450a1ad6e71e73a16c4a9..9829008c55d723328e1be1c4740423af1758f93f 100644 (file)
--- a/balsa.spec
+++ b/balsa.spec
@@ -4,38 +4,41 @@
 %bcond_without gpgme           # build without GPG support (experimental)
 %bcond_without esmtp           # build without ESMTP support
 %bcond_without gtkhtml         # build without HTML support
-
-%define                snap    20030630
-
+#
 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
 Name:          balsa
 Version:       2.0.17
-Release:       1
+Release:       2
 License:       GPL
 Group:         X11/Applications
 Source0:       http://balsa.gnome.org/%{name}-%{version}.tar.bz2
 # Source0-md5: 851db68728ed9adea615eb2f249fa1ee
-#Source0:      %{name}-%{version}-%{snap}.tar.bz2
-#Patch0:               %{name}-libtool_hack.patch
+Patch0:                %{name}-locale-names.patch
 Patch1:                %{name}-desktop.patch
+Patch2:                %{name}-iconv-in-libc.patch
 URL:           http://balsa.gnome.org/
-BuildRequires: autoconf
+BuildRequires: aspell-devel >= 0.50
+BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 %{?with_esmtp:BuildRequires:   libesmtp-devel}
 BuildRequires: libgnomeprintui-devel >= 1.106.0
-%{?with_gpgme:BuildRequires:   gpgme-devel >= 0.3.14}
+%{?with_gpgme:BuildRequires:   gpgme-devel >= 0.4.3}
 BuildRequires: gtk+2-devel >= 2.2.0
-%{?with_gtkhtml:BuildRequires: libgtkhtml-devel}
+# 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: libgnome-devel
+BuildRequires: libgnomeprintui-devel >= 2.1.4
 BuildRequires: libgnomeui-devel >= 2.3.3.1-2
+BuildRequires: libtool
 %{?with_ldap:BuildRequires:    openldap-devel}
-BuildRequires: aspell-devel >= 0.50
-BuildRequires: xft-devel
-Requires:      gpgme >= 0.3.14
+BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: pcre-devel >= 3.0
+BuildRequires: scrollkeeper >= 0.1.4
+Requires:      gpgme >= 0.4.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -61,12 +64,19 @@ Suporta caixas de correio locais, POP3 a IMAP.
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
+%patch2 -p1
+
+mv -f po/{no,nb}.po
 
 %build
-#./autogen.sh
-cp -f /usr/share/automake/config.* .
+intltoolize --copy --force
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__autoconf}
 %configure \
        --with-ssl \
        %{!?with_esmtp:--without-esmtp} \
@@ -98,6 +108,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/sound/events/*
 %{_datadir}/%{name}
 %{_datadir}/sounds/%{name}
+%{_libdir}/bonobo/servers/*.server
+%{_datadir}/idl/*.idl
 %{_mandir}/man1/*
 %{_omf_dest_dir}/%{name}
 %{_desktopdir}/*