X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=balsa.spec;h=61e6085452f3680e71eceb8119bb01bfaa261731;hb=ddd73823c4ee9bb8bb9459817113d8d2d9c839c6;hp=f92964cb670f8e9c6f8fedf0badec563ce9c30eb;hpb=cea642693a1d5e0b26839f1f77fff19d9601d2f4;p=packages%2Fbalsa.git

diff --git a/balsa.spec b/balsa.spec
index f92964c..61e6085 100644
--- a/balsa.spec
+++ b/balsa.spec
@@ -1,50 +1,65 @@
+# TODO:
+#       - not packaged /usr/share/locale/ar/LC_MESSAGES/balsa.mo
+#       - problems with id locale
 #
 # 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_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):	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.3.5
-Release:	2
+Version:	2.4.0
+Release:	1
 License:	GPL
 Group:		X11/Applications
-Source0:	http://balsa.gnome.org/%{name}-%{version}.tar.bz2
-# Source0-md5:	ccc5f1f11028dd604c6dac97017a1274
-Patch0:		%{name}-locale-names.patch
-Patch1:		%{name}-desktop.patch
-Patch2:		%{name}-includes.patch
-Patch3:		%{name}-no_hooks.patch
+Source0:	http://pawsa.fedorapeople.org/balsa/%{name}-%{version}.tar.bz2
+# Source0-md5:	47d68219a5ee768f1ebd2502a9c3c6f2
+Patch0:		%{name}-desktop.patch
+Patch1:		%{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
-BuildRequires:	heimdal-devel
-%{?with_esmtp:BuildRequires:	libesmtp-devel}
-BuildRequires:	libgnomeprintui-devel >= 1.106.0
+%{?with_compface:BuildRequires:	compface-devel}
 BuildRequires:	glib2-devel >= 2.6.4-1
-BuildRequires:	gmime-devel >= 2.1.9
+BuildRequires:	gmime-devel >= 2.4.0
 %{?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:	intltool
-%{?with_gtkhtml:BuildRequires:	libgtkhtml-devel >= 2.0}
-BuildRequires:	libltdl-devel
-BuildRequires:	libgnomeprintui-devel >= 2.1.4
+BuildRequires:	heimdal-devel
+%{?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}
+%endif
 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:	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
@@ -52,30 +67,24 @@ 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
-%patch2 -p1
-%patch3 -p1
-
-rm -f po/no.{po,gmo}
 
 %build
-%{__intltoolize}
-%{__glib_gettextize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -86,7 +95,12 @@ rm -f po/no.{po,gmo}
 	--with-ssl \
 	%{!?with_esmtp:--without-esmtp} \
 	%{!?with_gtkhtml:--disable-gtkhtml}\
+	%{?with_gtkhtml2:--with-gtkhtml=2}\
 	%{?with_gpgme:--with-gpgme} \
+	%{?with_compface:--with-compface} \
+	%{?with_gtksourceview:--with-gtksourceview} \
+	%{?with_gtkspell:--with-gtkspell} \
+	%{?with_sqlite:--with-sqlite} \
 	%{?with_ldap:--with-ldap}
 %{__make}
 
@@ -96,6 +110,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