- updated to 2.4.9

[packages/balsa.git] / balsa.spec

diff --git a/balsa.spec b/balsa.spec
index d243c1cad3d0513539e86a7114be7e476335498c..4509f5999d2b065211d563b8652bc6ef87a2e817 100644 (file)
--- a/balsa.spec
+++ b/balsa.spec
@@ -18,48 +18,51 @@ 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.3.14
-Release:       2
-License:       GPL
+Version:       2.4.9
+Release:       1
+License:       GPL v3+
 Group:         X11/Applications
-Source0:       http://balsa.gnome.org/%{name}-%{version}.tar.bz2
-# Source0-md5: 6a86f8bebc21bd279b9fd4d2a21a36c0
+Source0:       http://pawsa.fedorapeople.org/balsa/%{name}-%{version}.tar.bz2
+# Source0-md5: bd7ac44f0cf3117a5fdb46d17dac2b51
 Patch0:                %{name}-desktop.patch
-Patch1:                %{name}-includes.patch
-Patch2:                %{name}-without_id_lang.patch
 URL:           http://balsa.gnome.org/
 BuildRequires: ORBit2-devel >= 1:2.12.4
 BuildRequires: aspell-devel >= 2:0.50
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 %{?with_compface:BuildRequires:        compface-devel}
-BuildRequires: krb5-devel
-%{?with_esmtp:BuildRequires:   libesmtp-devel >= 1.0.4}
-BuildRequires: libgnomeprintui-devel >= 1.106.0
+BuildRequires: docbook-dtd412-xml
+BuildRequires: gettext-devel
 BuildRequires: glib2-devel >= 2.6.4-1
-BuildRequires: gmime-devel >= 2.1.9
+BuildRequires: gmime-devel >= 2.4.0
+BuildRequires: gnome-doc-utils
 %{?with_gpgme:BuildRequires:   gpgme-devel >= 1:0.9.0}
-BuildRequires: gtk+2-devel >= 2:2.2.0
+BuildRequires: gtk+2-devel >= 2:2.10.0
 %{?with_gtksourceview:BuildRequires:   gtksourceview-devel}
 %{?with_gtkspell:BuildRequires:        gtkspell-devel}
+BuildRequires: heimdal-devel
 BuildRequires: intltool
+%{?with_esmtp:BuildRequires:   libesmtp-devel >= 1.0.4}
 %if %{with gtkhtml}
-%{?with_gtkhtml2:BuildRequires:        libgtkhtml-devel >= 2.0}
 %{!?with_gtkhtml2:BuildRequires:       gtkhtml-devel >= 3.0}
+%{?with_gtkhtml2:BuildRequires:        libgtkhtml-devel >= 2.0}
 %endif
-BuildRequires: libltdl-devel
-BuildRequires: libgnomeprintui-devel >= 2.1.4
 BuildRequires: libgnomeui-devel >= 2.3.3.1-2
+BuildRequires: libltdl-devel
+BuildRequires: libnotify-devel
 BuildRequires: libtool
-%{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
+%{?with_ldap:BuildRequires:    openldap-devel >= 2.4.6}
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pcre-devel >= 3.0
+BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: scrollkeeper >= 0.1.4
 # actually, it requires sqlite >= 2.8
 %{?with_sqlite:BuildRequires:  sqlite3-devel}
 %{?with_gpgme:Requires:        gpgme >= 1:0.9.0}
 Requires(post,postun): scrollkeeper
+# sr@Latn vs. sr@latin
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -73,7 +76,7 @@ cajas de correo electrónico locales, POP3 y IMAP.
 
 %description -l pl.UTF-8
 Balsa to klient e-mail. Jest częścią środowiska GNOME. Obsługuje POP3,
-IMAP oraz lokalne skrzynki pocztowe. 
+IMAP oraz lokalne skrzynki pocztowe.
 
 %description -l pt_BR.UTF-8
 Balsa é um leitor de e-mail, parte do ambiente de desktop GNOME.
@@ -82,12 +85,8 @@ Suporta caixas de correio locais, POP3 a IMAP.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
-%{__intltoolize}
-%{__glib_gettextize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -113,6 +112,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang %{name} --with-gnome --all-name
 
 %clean