X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=balsa.spec;h=9829008c55d723328e1be1c4740423af1758f93f;hb=3e27fb1dceb96cc89cfb1e2ce3a2da943c77de3e;hp=0721725c900a781931ce73a7fc8aacf2cc66340a;hpb=93665131a98b645313511f2f887db4ceed04ffec;p=packages%2Fbalsa.git

diff --git a/balsa.spec b/balsa.spec
index 0721725..9829008 100644
--- a/balsa.spec
+++ b/balsa.spec
@@ -1,30 +1,44 @@
-
-%define		snap	20030322
-
+#
+# Conditional build:
+%bcond_without	ldap		# build without LDAP support
+%bcond_without	gpgme		# build without GPG support (experimental)
+%bcond_without	esmtp		# build without ESMTP support
+%bcond_without	gtkhtml		# build without HTML support
+#
 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.10
-#Release:	1.%{snap}.1
+Version:	2.0.17
 Release:	2
 License:	GPL
 Group:		X11/Applications
 Source0:	http://balsa.gnome.org/%{name}-%{version}.tar.bz2
-#Source0:	%{name}-%{version}-%{snap}.tar.bz2
-#Patch0:		%{name}-libtool_hack.patch
+# Source0-md5:	851db68728ed9adea615eb2f249fa1ee
+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
-BuildRequires:	libesmtp-devel
+%{?with_esmtp:BuildRequires:	libesmtp-devel}
 BuildRequires:	libgnomeprintui-devel >= 1.106.0
+%{?with_gpgme:BuildRequires:	gpgme-devel >= 0.4.3}
 BuildRequires:	gtk+2-devel >= 2.2.0
-BuildRequires:  libgtkhtml-devel
-BuildRequires:  libgnome-devel
-BuildRequires:  libgnomeui-devel
-BuildRequires:  aspell-devel >= 0.50
+# 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:	libgnomeprintui-devel >= 2.1.4
+BuildRequires:	libgnomeui-devel >= 2.3.3.1-2
+BuildRequires:	libtool
+%{?with_ldap:BuildRequires:	openldap-devel}
+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
@@ -50,54 +64,53 @@ Suporta caixas de correio locais, POP3 a IMAP.
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
-%build
-#glib-gettextize --copy --force
-#intltoolize --copy --force
-#%%{__libtoolize}
-#%%{__aclocal}
-#%%{__autoheader}
-#%%{__automake}
-#%%{__autoconf}
+mv -f po/{no,nb}.po
 
-#%cd libmutt
-#%%{__libtoolize}
-#%%{__aclocal}
-#%%{__autoheader}
-#%%{__automake}
-#%%{__autoconf}
-#%cd ..
-#./autogen.sh
+%build
+intltoolize --copy --force
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__autoconf}
 %configure \
 	--with-ssl \
-	--enable-gpgme \
-	--enable-ldap
+	%{!?with_esmtp:--without-esmtp} \
+	%{?with_gtkhtml:--enable-gtkhtml} \
+	%{!?with_gtkhtml:--disable-gtkhtml}\
+	%{!?with_gpgme:--without-gpgme} \
+	%{?with_ldap:--with-ldap} \
+	%{!?with_ldap:--without-ldap}
 
-%{__make} 
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT 
+	DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name} --with-gnome --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /usr/bin/scrollkeeper-update 
+%post -p /usr/bin/scrollkeeper-update
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/*
 %{_sysconfdir}/sound/events/*
-%{_datadir}/applications/*
 %{_datadir}/%{name}
 %{_datadir}/sounds/%{name}
+%{_libdir}/bonobo/servers/*.server
+%{_datadir}/idl/*.idl
 %{_mandir}/man1/*
 %{_omf_dest_dir}/%{name}
+%{_desktopdir}/*
 %{_pixmapsdir}/*