X-Git-Url: http://git.pld-linux.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=balsa.spec;h=1e87384c46dca15ac8d933e599733c03ce4185e8;hb=8d3051a186308ea4061af5fb11d78f4ce63a8e3b;hp=1289f0fbfafe70a73a51377499eb6e3b0d2e4e36;hpb=96b911baf78e741824c01795637112ac9816911e;p=packages%2Fbalsa.git

diff --git a/balsa.spec b/balsa.spec
index 1289f0f..1e87384 100644
--- a/balsa.spec
+++ b/balsa.spec
@@ -1,6 +1,7 @@
 # TODO:
 #       - not packaged /usr/share/locale/ar/LC_MESSAGES/balsa.mo
 #       - problems with id locale
+#	- finish support for gtkhtml-4
 #
 # Conditional build:
 %bcond_without	ldap		# build without LDAP support
@@ -18,47 +19,52 @@ 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.20
-Release:	1
-License:	GPL
+Version:	2.4.9
+Release:	0.1
+License:	GPL v3+
 Group:		X11/Applications
-Source0:	http://balsa.gnome.org/%{name}-%{version}.tar.bz2
-# Source0-md5:	64763beb79731649da7e327b1140843a
+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
+Patch1:		%{name}-gtkhtml4.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:	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.10.0
 %{?with_gtksourceview:BuildRequires:	gtksourceview-devel}
 %{?with_gtkspell:BuildRequires:	gtkspell-devel}
+BuildRequires:	heimdal-devel
 BuildRequires:	intltool
-BuildRequires:	krb5-devel
 %{?with_esmtp:BuildRequires:	libesmtp-devel >= 1.0.4}
 %if %{with gtkhtml}
+%{!?with_gtkhtml2:BuildRequires:	gtkhtml-devel >= 3.14}
 %{?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:	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
@@ -72,7 +78,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,11 +88,8 @@ Suporta caixas de correio locais, POP3 a IMAP.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
-%{__intltoolize}
-%{__glib_gettextize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -112,6 +115,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