- updated to final 1.4 (yeah!)

- semi-sorted conigure options, cosmetics
- added _with_slang conditional

Changed files:
    mutt.spec -> 1.121

diff --git a/mutt.spec b/mutt.spec
index 71de86cfbc13fd676871fbd8ba259add7e445350..5904e2298e31d14352734950ab339d8e418503df 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,3 +1,6 @@
+# conditionals:
+# --with slang:        use slang library instead of ncurses
+
 Summary:       The Mutt Mail User Agent
 Summary(de):   Der Mutt Mail-User-Agent
 Summary(es):   Mutt, cliente de correo electrónico
@@ -8,8 +11,8 @@ Summary(ru):   
 Summary(tr):   Mutt elektronik posta programý
 Summary(uk):   ðÏÛÔÏ×Á Ë̦¤ÎÔÓØËÁ ÐÒÏÇÒÁÍÁ Mutt
 Name:          mutt
-Version:       1.3.99i
-Release:       2
+Version:       1.4
+Release:       1
 Epoch:         5
 License:       GPL
 Group:         Applications/Mail
@@ -36,10 +39,11 @@ Patch15:    %{name}-pgp_hook.patch
 URL:           http://www.mutt.org/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: ncurses-devel >= 5.0
+%{!?_with_slang:BuildRequires:         ncurses-devel >= 5.0}
+%{?_with_slang:BuildRequires:          slang-devel}
+%{!?_without_sasl:BuildRequires:       cyrus-sasl-devel}
 BuildRequires: openssl-devel >= 0.9.6a
 BuildRequires: sgml-tools
-%{!?_without_sasl:BuildRequires:       cyrus-sasl-devel}
 Requires:      iconv
 Requires:      mailcap
 Requires:      smtpdaemon
@@ -119,31 +123,30 @@ Mutt - 
 %{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
-#PGP=%{_bindir}/pgp PGPK=%{_bindir}/pgpk
-#CFLAGS="%{optflags} -I%{_includedir}/slang" \
 %configure \
-       --enable-pop \
+       %{!?debug:--disable-debug} %{?debug:--enable-debug} \
+       %{!?_with_slang:--with-curses} \
+       %{?_with_slang:--with-slang} \
+       --enable-compressed \
+       --enable-external-dotlock \
        --enable-imap \
+       --without-included-gettext \
        --enable-mailtool \
-       --enable-external-dotlock \
-       --enable-compressed \
-       %{!?debug:--disable-debug} %{?debug:--enable-debug} \
-       --disable-warnings \
-       --with-curses \
+       --with-mixmaster \
+       --enable-pop \
        --with-regex \
-       --with-ssl \
        %{!?_without_sasl:--with-sasl} %{?_without_sasl:--without-sasl} \
-       --without-included-gettext \
+       --with-ssl \
+       --disable-warnings \
+       --with-docdir=%{_docdir}/%{name}-%{version} \
        --with-homespool=Maildir \
-       --with-mixmaster \
        --with-mailpath=/var/mail \
        --with-sharedir=%{_datadir} \
-       --with-docdir=%{_docdir}/%{name}-%{version} \
        --prefix=%{_prefix} \
        --bindir=%{_bindir} \
-       --sysconfdir=%{_sysconfdir} \
        --datadir=%{_datadir} \
-       --mandir=%{_mandir}
+       --mandir=%{_mandir} \
+       --sysconfdir=%{_sysconfdir}
 
 %{__make}
 %{__make} manual.txt -C doc