X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=mutt.spec;h=4c57ee9c268f680bd48141c86e4787514a710151;hb=f4d5da48b7896e17a5533111d13eed20842dc461;hp=8e59e3240fea3e3fa9eef7b435fce9a6a962a12f;hpb=4f08f01c3e66af92b25c7505d26580ff4f8f7f3a;p=packages%2Fmutt.git

diff --git a/mutt.spec b/mutt.spec
index 8e59e32..4c57ee9 100644
--- 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,12 +11,12 @@ Summary(ru):	
 Summary(tr):	Mutt elektronik posta programý
 Summary(uk):	ðÏÛÔÏ×Á Ë̦¤ÎÔÓØËÁ ÐÒÏÇÒÁÍÁ Mutt
 Name:		mutt
-Version:	1.3.28i
-Release:	2
+Version:	1.4
+Release:	3
 Epoch:		5
 License:	GPL
 Group:		Applications/Mail
-Source0:	ftp://ftp.mutt.org/pub/mutt/%{name}-%{version}.tar.gz
+Source0:	ftp://ftp.mutt.org/mutt/%{name}-%{version}i.tar.gz
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}.1.pl
@@ -31,13 +34,19 @@ 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
 URL:		http://www.mutt.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	ncurses-devel >= 5.0
+%{!?_without_sasl:BuildRequires:	cyrus-sasl-devel}
+BuildRequires:	gettext-devel
+%{!?_with_slang:BuildRequires:		ncurses-devel >= 5.0}
 BuildRequires:	openssl-devel >= 0.9.6a
 BuildRequires:	sgml-tools
-%{!?_without_sasl:BuildRequires:	cyrus-sasl-devel}
+%{?_with_slang:BuildRequires:		slang-devel}
 Requires:	iconv
 Requires:	mailcap
 Requires:	smtpdaemon
@@ -109,35 +118,40 @@ Mutt - 
 %patch11 -p1
 %patch12 -p1
 #%patch13 -p0
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p0
 
 %build
-autoconf
-#PGP=%{_bindir}/pgp PGPK=%{_bindir}/pgpk
-CFLAGS="%{optflags} -I%{_includedir}/slang" \
+%{__gettextize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__automake}
 %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-iconv \
+	--with-mixmaster \
+	--enable-pop \
 	--with-regex \
-	--with-ssl \
 	%{!?_without_sasl:--with-sasl} %{?_without_sasl:--without-sasl} \
-	--without-included-nls \
+	--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
@@ -153,9 +167,6 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/Mail
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/pl/man1
 
-gzip -9nf contrib/{*rc*,*cap*} \
-	ChangeLog README TODO NEWS README.SECURITY README.SSL doc/manual.txt
-
 # conflict with qmail
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
 
@@ -166,7 +177,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc *.gz contrib/{*rc*,*cap*} doc/manual*html doc/manual.txt.gz
+%doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL doc/manual.txt
 %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/Muttrc
 %attr(755,root,root) %{_bindir}/mutt
 %attr(755,root,root) %{_bindir}/flea