]> git.pld-linux.org Git - packages/mutt.git/blobdiff - mutt.spec
- readded removed patch15
[packages/mutt.git] / mutt.spec
index 4c5996ff554967c035ffd74bea86a9542b627687..d0cf9ed3b06cc7fe36902cd795d9901f5050f373 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,7 +1,10 @@
 #
 # Conditional build:
-# _with_slang  - use slang library instead of ncurses
-# _with_nntp   - use VVV's NNTP patch
+%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
@@ -14,16 +17,16 @@ Summary(ru):        
 Summary(tr):   Mutt elektronik posta programý
 Summary(uk):   ðÏÛÔÏ×Á Ë̦¤ÎÔÓØËÁ ÐÒÏÇÒÁÍÁ Mutt
 Name:          mutt
-Version:       1.4.1
-Release:       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
+# Source0-md5: 710bd56d3c4c4bcd1403bc4e053f7476
 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
@@ -37,26 +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
-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
-%{!?_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
-%{!?_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
-%{?_with_slang:BuildRequires:          slang-devel}
+BuildRequires: sgml-tools-dtd
+%{?with_slang:BuildRequires:   slang-devel}
+%{?with_esmtp:BuildRequires:   libesmtp-devel}
 Requires:      iconv
 Requires:      mailcap
+%{?with_home_etc:Requires:     home-etc >= 1.0.8}
 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,
@@ -116,7 +127,6 @@ Mutt - 
 
 %prep
 %setup -q -n %{name}-%(echo %{version} | sed 's/i$//')
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -133,9 +143,12 @@ Mutt - 
 %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}
@@ -146,8 +159,8 @@ rm -f doc/{manual*.html,manual.txt}
 %{__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 \
@@ -155,9 +168,11 @@ rm -f doc/{manual*.html,manual.txt}
        --enable-mailtool \
        --with-mixmaster \
        --enable-pop \
-       %{?_with_nntp:--enable-nntp} \
+       %{?with_nntp:--enable-nntp} \
        --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} \
@@ -175,16 +190,17 @@ rm -f doc/{manual*.html,manual.txt}
 
 %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 doc/manual.txt $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 # conflict with qmail
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
@@ -198,7 +214,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
@@ -206,7 +222,8 @@ rm -rf $RPM_BUILD_ROOT
 %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*/*
This page took 0.044742 seconds and 4 git commands to generate.