- desktop fixes, rel. 4

[packages/balsa.git] / balsa.spec

diff --git a/balsa.spec b/balsa.spec
index 5fa8dc4c810ef8590b1ddf4c6dee2131dd476ba1..439043d4646e86184a47b8cde2ca76c7284417c0 100644 (file)
--- a/balsa.spec
+++ b/balsa.spec
@@ -1,49 +1,47 @@
+#
+# 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
+#
 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:       1.2.3
-Release:       1
+Version:       2.0.17
+Release:       4
 License:       GPL
 Group:         X11/Applications
-Group(de):     X11/Applikationen
-Group(pl):     X11/Aplikacje
-Source0:       http://www.theochem.kth.se/~pawsa/balsa/%{name}-%{version}.tar.bz2
-Patch0:                %{name}-configure.patch
-BuildRequires: autoconf
+Source0:       http://balsa.gnome.org/%{name}-%{version}.tar.bz2
+# Source0-md5: 851db68728ed9adea615eb2f249fa1ee
+Patch0:                %{name}-locale-names.patch
+Patch1:                %{name}-desktop.patch
+Patch2:                %{name}-iconv-in-libc.patch
+URL:           http://balsa.gnome.org/
+BuildRequires: aspell-devel >= 0.50
+BuildRequires: autoconf >= 2.52
 BuildRequires: automake
-BuildRequires: bison
-BuildRequires: cyrus-sasl-devel
-BuildRequires: docbook-style-dsssl
-BuildRequires: flex
-BuildRequires: gal-devel >= 0.18
-BuildRequires: gdk-pixbuf-devel
-BuildRequires: gettext-devel
-BuildRequires: gnome-doc-tools
-BuildRequires: gnome-libs-devel >= 1.2.1
-BuildRequires: gnome-print-devel >= 0.25.0
-BuildRequires: gtkhtml-devel >= 0.12.0
-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: intltool
+# 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: libPropList-devel
-BuildRequires: libstdc++-devel
+BuildRequires: libgnomeprintui-devel >= 2.1.4
+BuildRequires: libgnomeui-devel >= 2.3.3.1-2
 BuildRequires: libtool
-BuildRequires: openjade
-BuildRequires: openldap-devel
-BuildRequires: openssl-devel
-BuildRequires: pcre-devel
-BuildRequires: pam-devel
-BuildRequires: pspell-devel >= 12.1
-BuildRequires: freetype-devel
-URL:           http://www.balsa.net/
+%{?with_ldap:BuildRequires:    openldap-devel}
+BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: pcre-devel >= 3.0
+BuildRequires: scrollkeeper >= 0.1.4
+%{?with_gpgme:Requires:        gpgme >= 0.4.3}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _prefix         /usr/X11R6
-%define                _mandir         %{_prefix}/man
-%define                _sysconfdir     /etc/X11/GNOME
-%define                _localstatedir  /var
-
 %description
 e-Mail program for the GNOME desktop, supporting local mailboxes, POP3
 and IMAP. GNOME is the GNU Network Object Model Environment. That's a
@@ -57,7 +55,7 @@ cajas de correo electr
 %description -l pl
 Balsa to klient e-mail dla ¶rodowiska GNOME. Obs³uguje POP3, IMAP oraz
 lokalne skrzynki pocztowe. GNOME to Network Object Model Environment.
-Mimo osobliwej nazwy jest to naparwdê estetyczne ¶rodowisko graficzne.
+Mimo osobliwej nazwy jest to naprawdê estetyczne ¶rodowisko graficzne.
 Dziêki niemu u¿ywanie komputera jest ³atwiejsze; system jest
 potê¿niejszy i ³atwo go skonfigurowaæ.
 
@@ -67,55 +65,53 @@ Suporta caixas de correio locais, POP3 a IMAP.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+mv -f po/{no,nb}.po
 
 %build
-libtoolize --copy --force
-gettextize --copy --force 
-aclocal -I macros
-autoconf
-rm -f missing
-automake -a -c
-(cd libmutt
-aclocal
-autoconf
-automake -a -c)
+intltoolize --copy --force
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__autoconf}
 %configure \
-       --enable-system-install \
-       --enable-all \
-       --enable-info \
-       --disable-threads \
-       --disable-more-warnings \
-       --with-mailpath=/var/mail \
        --with-ssl \
-       --enable-pcre \
-       --enable-ldap \
-       --enable-gtkhtml
+       %{!?with_esmtp:--without-esmtp} \
+       %{?with_gtkhtml:--enable-gtkhtml} \
+       %{!?with_gtkhtml:--disable-gtkhtml}\
+       %{!?with_gpgme:--without-gpgme} \
+       %{?with_ldap:--with-ldap} \
+       %{!?with_ldap:--without-ldap}
 
-# TODO find this gdp stylesheet
-%{__make} \
-       GDP_STYLESHEET=/usr/share/sgml/docbook/gnome-customization-1.0/gdp-both.dsl
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       desktopdir=%{_applnkdir}/Network/Mail
-
-gzip -9nf AUTHORS ChangeLog NEWS README TODO
+       DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang %{name} --with-gnome
+%find_lang %{name} --with-gnome --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /usr/bin/scrollkeeper-update
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc *.gz
+%doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/*
 %{_sysconfdir}/sound/events/*
-%{_datadir}/sounds/balsa
-%{_pixmapsdir}/*
-%{_applnkdir}/Network/Mail/*
+%{_datadir}/%{name}
+%{_datadir}/sounds/%{name}
+%{_libdir}/bonobo/servers/*.server
+%{_datadir}/idl/*.idl
 %{_mandir}/man1/*
+%{_omf_dest_dir}/%{name}
+%{_desktopdir}/*
+%{_pixmapsdir}/*