- hopefully fixed broken rr.compressed and php_hook patches, updated manual patch

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index 2e682e1749ac45c9549ed6ece3e04230c4a3dac5..8f2adc6a9b9042e6132077fad0abbb3b0c387ebb 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,27 +1,32 @@
-# conditionals:
-# --with slang:        use slang library instead of ncurses
-# --with nntp: use VVV's NNTP patch
-
+#
+# Conditional build:
+%bcond_with slang              # use slang library instead of ncurses
+%bcond_with nntp               # use VVV's NNTP patch
+%bcond_with esmtp              # use esmtp patch
+%bcond_without sasl            # don't use sasl
+%bcond_without home_etc                # don't use home_etc
+#

 Summary:       The Mutt Mail User Agent
 Summary(de):   Der Mutt Mail-User-Agent
 Summary(es):   Mutt, cliente de correo electrónico
 Summary(fr):   Agent courrier Mutt
 Summary:       The Mutt Mail User Agent
 Summary(de):   Der Mutt Mail-User-Agent
 Summary(es):   Mutt, cliente de correo electrónico
 Summary(fr):   Agent courrier Mutt

+Summary(ko):   ÅؽºÆ® ±â¹ÝÀÇ MUA

 Summary(pl):   Program pocztowy Mutt
 Summary(pt_BR):        Mutt, cliente de correio eletrônico
 Summary(ru):   ðÏÞÔÏ×ÁÑ ËÌÉÅÎÔÓËÁÑ ÐÒÏÇÒÁÍÍÁ Mutt
 Summary(tr):   Mutt elektronik posta programý
 Summary(uk):   ðÏÛÔÏ×Á Ë̦¤ÎÔÓØËÁ ÐÒÏÇÒÁÍÁ Mutt
 Name:          mutt
 Summary(pl):   Program pocztowy Mutt
 Summary(pt_BR):        Mutt, cliente de correio eletrônico
 Summary(ru):   ðÏÞÔÏ×ÁÑ ËÌÉÅÎÔÓËÁÑ ÐÒÏÇÒÁÍÍÁ Mutt
 Summary(tr):   Mutt elektronik posta programý
 Summary(uk):   ðÏÛÔÏ×Á Ë̦¤ÎÔÓØËÁ ÐÒÏÇÒÁÍÁ Mutt
 Name:          mutt

-Version:       1.4
-Release:       5.2
-Epoch:         5
+Version:       1.4.2.1
+Release:       4
+Epoch:         6

 License:       GPL
 Group:         Applications/Mail
 Source0:       ftp://ftp.mutt.org/mutt/%{name}-%{version}i.tar.gz
 License:       GPL
 Group:         Applications/Mail
 Source0:       ftp://ftp.mutt.org/mutt/%{name}-%{version}i.tar.gz

+# Source0-md5: 710bd56d3c4c4bcd1403bc4e053f7476

 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Source3:       %{name}.1.pl
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Source3:       %{name}.1.pl

-Patch0:                %{name}-home_etc.patch

 Patch1:                %{name}-forcedotlock.patch
 Patch2:                %{name}-muttbug-tmp.patch
 Patch3:                %{name}-rr.compressed.patch
 Patch1:                %{name}-forcedotlock.patch
 Patch2:                %{name}-muttbug-tmp.patch
 Patch3:                %{name}-rr.compressed.patch


@@ -35,27 +40,34 @@ Patch10:    %{name}-cd.purge_message.patch
 Patch11:       %{name}-cd.signatures_menu.patch
 Patch12:       %{name}-folder_columns.patch
 Patch13:       %{name}-nr.tag_prefix_cond.patch
 Patch11:       %{name}-cd.signatures_menu.patch
 Patch12:       %{name}-folder_columns.patch
 Patch13:       %{name}-nr.tag_prefix_cond.patch

-Patch14:       %{name}-LIBOBJ.patch
-Patch15:       %{name}-pgp_hook.patch
-Patch16:       %{name}-manual.patch
-Patch17:       %{name}-send_charset.patch
-Patch18:       %{name}-xface.patch
-Patch19:       %{name}-sasl2.patch
-Patch20:       %{name}-nntp.patch
+Patch14:       %{name}-pgp_hook.patch
+Patch15:       %{name}-manual.patch
+Patch16:       %{name}-send_charset.patch
+Patch17:       %{name}-xface.patch
+Patch18:       %{name}-sasl2.patch
+Patch19:       %{name}-nntp.patch
+Patch20:       %{name}-esmtp.patch
+Patch21:       %{name}-home_etc.patch
+Patch22:       %{name}-kill_warnings.patch

 URL:           http://www.mutt.org/
 BuildRequires: autoconf
 BuildRequires: automake
 URL:           http://www.mutt.org/
 BuildRequires: autoconf
 BuildRequires: automake

-%{!?_without_sasl:BuildRequires:       cyrus-sasl-devel >= 2.1.0}
+%{?with_sasl:BuildRequires:    cyrus-sasl-devel >= 2.1.0}
+%{?with_home_etc:BuildRequires:        home-etc-devel >= 1.0.8}

 BuildRequires: gettext-devel
 BuildRequires: gettext-devel

-%{!?_with_slang:BuildRequires:         ncurses-devel >= 5.0}
-BuildRequires: openssl-devel >= 0.9.7
+%{!?with_slang:BuildRequires:  ncurses-devel >= 5.0}
+BuildRequires: openssl-devel >= 0.9.7c

 BuildRequires: sgml-tools
 BuildRequires: sgml-tools

-%{?_with_slang:BuildRequires:          slang-devel}
+BuildRequires: sgml-tools-dtd
+%{?with_slang:BuildRequires:   slang-devel}
+%{?with_esmtp:BuildRequires:   libesmtp-devel}

 Requires:      iconv
 Requires:      mailcap
 Requires:      iconv
 Requires:      mailcap

-Requires:      smtpdaemon
+%{?with_home_etc:Requires:     home-etc >= 1.0.8}

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

+%define                specflags_ia32  "-fomit-frame-pointer"
+

 %description
 Mutt is a small but very poweful full-screen Unix mail client.
 Features include MIME support, color, POP3 support, message threading,
 %description
 Mutt is a small but very poweful full-screen Unix mail client.
 Features include MIME support, color, POP3 support, message threading,


@@ -77,6 +89,13 @@ puissant. Il dispose de la gestion MIME, des couleurs, de la gestion
 POP, des fils de discussion, des touches liées et d'un mode de tri sur
 les fils.
 
 POP, des fils de discussion, des touches liées et d'un mode de tri sur
 les fils.
 

+%description -l ko
+Mutt´Â ÀÛÁö¸¸ ¸Å¿ì °­·ÂÇÑ ÅؽºÆ® ±â¹ÝÀÇ ¸ÞÀÏ Å¬¶óÀ̾ðÆ®ÀÌ´Ù. Mutt´Â
+¸¹Àº ¼³Á¤ÀÌ °¡´ÉÇÏ´Ù. ±×¸®°í, Å°¹ÙÀεù, Å°º¸µå ¸ÞÅ©·Î, ¸ÞÀÏ ½º·¹µù°ú
+°°Àº Áøº¸µÈ ÇüÅÂ¿Í Á¤±ÔÇ¥Çö½Ä °Ë»ö, ¸ÞÀÏ¿¡¼­ ¼±ÅÃµÈ ±×·ìÀÇ ³»¿ë¿¡¼­
+°­·ÂÇÏ°Ô ÀÏÁ¤ÇÑ ÆÐÅÏÀ» ã¾Æ³»´Â °ÍÀ» Áö¿øÇÔÀ¸·Î½á ¸ÞÀÏÀÇ ÆÄ¿ö À¯Àú¿¡°Ô
+°¡Àå ÀûÇÕÇÏ´Ù.
+

 %description -l pl
 Mutt jest niewielkim programem pocztowym dla terminali tekstowych,
 posiadaj±cym du¿e mo¿liwo¶ci. Obs³uguje MIME, POP3, cztery formaty
 %description -l pl
 Mutt jest niewielkim programem pocztowym dla terminali tekstowych,
 posiadaj±cym du¿e mo¿liwo¶ci. Obs³uguje MIME, POP3, cztery formaty


@@ -108,7 +127,6 @@ Mutt - 
 
 %prep
 %setup -q -n %{name}-%(echo %{version} | sed 's/i$//')
 
 %prep
 %setup -q -n %{name}-%(echo %{version} | sed 's/i$//')

-%patch0 -p1

 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1


@@ -121,22 +139,30 @@ Mutt - 
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1

-#%patch13 -p0
+# disabled - changes default behaviour
+##%patch13 -p0

 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1

-%patch18 -p1
-%{!?_without_sasl:%patch19 -p1}
-%{?_with_nntp:%patch20 -p1}
+%patch17 -p1
+%{?with_sasl:%patch18 -p1}
+%{?with_nntp:%patch19 -p1}
+%{?with_esmtp:%patch20 -p1}
+%{?with_home_etc:%patch21 -p1}
+%patch22 -p1
+
+# force regeneration (manual.sgml is modified by some patches)
+rm -f doc/{manual*.html,manual.txt}

 
 %build
 %{__aclocal} -I m4
 %{__autoconf}
 
 %build
 %{__aclocal} -I m4
 %{__autoconf}

+%{__autoheader}

 %{__automake}
 %configure \
        %{!?debug:--disable-debug} %{?debug:--enable-debug} \
 %{__automake}
 %configure \
        %{!?debug:--disable-debug} %{?debug:--enable-debug} \

-       %{!?_with_slang:--with-curses} \
-       %{?_with_slang:--with-slang} \
+       %{!?with_slang:--with-curses} \
+       %{?with_slang:--with-slang} \

        --enable-compressed \
        --enable-external-dotlock \
        --enable-imap \
        --enable-compressed \
        --enable-external-dotlock \
        --enable-imap \


@@ -144,9 +170,11 @@ Mutt - 
        --enable-mailtool \
        --with-mixmaster \
        --enable-pop \
        --enable-mailtool \
        --with-mixmaster \
        --enable-pop \

-       %{?_with_nntp:--enable-nntp} \
+       %{?with_nntp:--enable-nntp} \

        --with-regex \
        --with-regex \

-       %{!?_without_sasl:--with-sasl} %{?_without_sasl:--without-sasl} \
+       %{?with_sasl:--with-sasl} %{!?with_sasl:--without-sasl} \
+       %{?with_home_etc:--with-home-etc} %{!?with_home_etc:--without-home-etc} \
+       %{?with_esmtp:--enable-libesmtp --with-libesmtp=/usr} \

        --with-ssl \
        --disable-warnings \
        --with-docdir=%{_docdir}/%{name}-%{version} \
        --with-ssl \
        --disable-warnings \
        --with-docdir=%{_docdir}/%{name}-%{version} \


@@ -164,16 +192,17 @@ Mutt - 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Network/Mail,%{_pixmapsdir}} \
-       $RPM_BUILD_ROOT%{_mandir}/pl/man1
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1,%{_datadir}/%{name}}

 
 

-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT

 
 

-%{__patch} -p0 -d $RPM_BUILD_ROOT%{_sysconfdir} < %PATCH17
+%{__patch} -p0 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH16}

 
 

-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/Mail
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}

 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/pl/man1
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/pl/man1

+install doc/manual.txt $RPM_BUILD_ROOT%{_datadir}/%{name}

 
 # conflict with qmail
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
 
 # conflict with qmail
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*


@@ -187,7 +216,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)

-%doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL doc/manual.txt README.xface
+%doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL README.xface %{?with_esmtp:Muttrc.esmtp}

 %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/Muttrc
 %attr(755,root,root) %{_bindir}/mutt
 %attr(755,root,root) %{_bindir}/flea
 %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/Muttrc
 %attr(755,root,root) %{_bindir}/mutt
 %attr(755,root,root) %{_bindir}/flea


@@ -195,7 +224,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pgp*
 %attr(2755,root,mail) %{_bindir}/mutt_dotlock
 
 %attr(755,root,root) %{_bindir}/pgp*
 %attr(2755,root,mail) %{_bindir}/mutt_dotlock
 

-%{_applnkdir}/Network/Mail/mutt.desktop
+%{_datadir}/%{name}
+%{_desktopdir}/*.desktop

 %{_pixmapsdir}/mutt.png
 %{_mandir}/man*/*
 %lang(pl) %{_mandir}/pl/man*/*
 %{_pixmapsdir}/mutt.png
 %{_mandir}/man*/*
 %lang(pl) %{_mandir}/pl/man*/*