X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmutt.git;a=blobdiff_plain;f=mutt.spec;h=bba2e961b2bcda6f77654a83012d1dc87cfb8c8c;hp=f1250161d6a0dcf85d06a28241a28773082c5d9e;hb=84858a79010b32ee250875dc942706c74f6f0b98;hpb=e840eb4b3c482cb6c2e9417dde7f2092fba3c68e

diff --git a/mutt.spec b/mutt.spec
index f125016..bba2e96 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,10 +1,11 @@
 #
 # 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
+%bcond_with	slang		# use slang library instead of ncurses
+%bcond_with	nntp		# use VVV's NNTP patch
+%bcond_with	esmtp		# use esmtp patch
+%bcond_with	folder_column	# build with folder_column 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
@@ -17,16 +18,17 @@ Summary(ru):	
 Summary(tr):	Mutt elektronik posta programý
 Summary(uk):	ðÏÛÔÏ×Á Ë̦¤ÎÔÓØËÁ ÐÒÏÇÒÁÍÁ Mutt
 Name:		mutt
-Version:	1.4.1
-Release:	7
-Epoch:		5
+Version:	1.4.2.1
+Release:	9
+Epoch:		6
 License:	GPL
 Group:		Applications/Mail
 Source0:	ftp://ftp.mutt.org/mutt/%{name}-%{version}i.tar.gz
-# Source0-md5: fb5418135c5be2638964eef2f654f847
+# Source0-md5:	710bd56d3c4c4bcd1403bc4e053f7476
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}.1.pl
+Patch0:		%{name}-paths.patch
 Patch1:		%{name}-forcedotlock.patch
 Patch2:		%{name}-muttbug-tmp.patch
 Patch3:		%{name}-rr.compressed.patch
@@ -40,24 +42,27 @@ 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
-Patch21:	%{name}-esmtp.patch
-Patch22:	%{name}-home_etc.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
+Patch23:	%{name}-Muttrc_mbox_path.patch
+Patch24:	%{name}-po.patch
 URL:		http://www.mutt.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 %{?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.7c
-BuildRequires:	sgml-tools
+BuildRequires:	groff
+%{!?with_slang:BuildRequires:	ncurses-devel >= 5.4-0.7}
+BuildRequires:	openssl-devel >= 0.9.7d
+BuildRequires:	sgml-tools >= 1.0.9-20
 BuildRequires:	sgml-tools-dtd
 %{?with_slang:BuildRequires:	slang-devel}
 %{?with_esmtp:BuildRequires:	libesmtp-devel}
@@ -66,7 +71,7 @@ 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"
+%define		specflags_ia32	-fomit-frame-pointer
 
 %description
 Mutt is a small but very poweful full-screen Unix mail client.
@@ -127,6 +132,7 @@ Mutt - 
 
 %prep
 %setup -q -n %{name}-%(echo %{version} | sed 's/i$//')
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -138,16 +144,21 @@ Mutt - 
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
-#%patch13 -p0
+# breaks display if arrow_cursor is set
+%{?with_folder_column:%patch12 -p1}
+# disabled - changes default behaviour
+##%patch13 -p0
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%patch18 -p1
-%{?with_sasl:%patch19 -p1}
-%{?with_nntp:%patch20 -p1}
-%{?with_esmtp:%patch21 -p1}
-%{?with_home_etc:%patch22 -p1}
+%patch17 -p1
+%{?with_sasl:%patch18 -p1}
+%{?with_nntp:%patch19 -p1}
+%{?with_esmtp:%patch20 -p1}
+%{?with_home_etc:%patch21 -p1}
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
 
 # force regeneration (manual.sgml is modified by some patches)
 rm -f doc/{manual*.html,manual.txt}
@@ -155,9 +166,10 @@ rm -f doc/{manual*.html,manual.txt}
 %build
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
-	%{!?debug:--disable-debug} %{?debug:--enable-debug} \
+	--%{?debug:en}%{!?debug:dis}able-debug \
 	%{!?with_slang:--with-curses} \
 	%{?with_slang:--with-slang} \
 	--enable-compressed \
@@ -169,12 +181,12 @@ rm -f doc/{manual*.html,manual.txt}
 	--enable-pop \
 	%{?with_nntp:--enable-nntp} \
 	--with-regex \
-	%{?with_sasl:--with-sasl} %{!?with_sasl:--without-sasl} \
-	%{?with_home_etc:--with-home-etc} %{!?with_home_etc:--without-home-etc} \
+	--with%{!?with_sasl:out}-sasl \
+	--with%{!?with_home_etc:out}-home-etc \
 	%{?with_esmtp:--enable-libesmtp --with-libesmtp=/usr} \
 	--with-ssl \
 	--disable-warnings \
-	--with-docdir=%{_docdir}/%{name}-%{version} \
+	--with-docdir=%{_docdir}/%{name} \
 	--with-homespool=Maildir \
 	--with-mailpath=/var/mail \
 	--with-sharedir=%{_datadir} \
@@ -194,12 +206,16 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1}
 %{__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%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/pl/man1
 
+# keep manual.txt.gz, the rest is installed as %doc
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/[!m]*
+gzip -9nf $RPM_BUILD_ROOT%{_docdir}/%{name}/manual.txt
+
 # conflict with qmail
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
 
@@ -212,7 +228,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 %{?with_esmtp: Muttrc.esmtp}
+%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
@@ -220,6 +236,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pgp*
 %attr(2755,root,mail) %{_bindir}/mutt_dotlock
 
+%{_docdir}/%{name}
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/mutt.png
 %{_mandir}/man*/*