- patch fixed (now it uses libhome_etc in an elegant way)

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index 84d60a09a23237c3aea9d4ecfd4e2379a13b83a2..c8787cfcb39d6feacd5c123d59aa30cbf2251c3f 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -2,7 +2,9 @@
 # Conditional build:
 # _with_slang  - use slang library instead of ncurses
 # _with_nntp   - use VVV's NNTP patch
+# _with_esmtp   - use esmtp patch
 # _without_sasl - don't use sasl
+# _without_home_etc - don't use home_etc
 #
 Summary:       The Mutt Mail User Agent
 Summary(de):   Der Mutt Mail-User-Agent
@@ -16,7 +18,7 @@ Summary(tr):  Mutt elektronik posta program
 Summary(uk):   ðÏÛÔÏ×Á Ë̦¤ÎÔÓØËÁ ÐÒÏÇÒÁÍÁ Mutt
 Name:          mutt
 Version:       1.4.1
-Release:       2
+Release:       6
 Epoch:         5
 License:       GPL
 Group:         Applications/Mail
@@ -25,7 +27,6 @@ Source0:      ftp://ftp.mutt.org/mutt/%{name}-%{version}i.tar.gz
 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
@@ -46,18 +47,23 @@ 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
 URL:           http://www.mutt.org/
 BuildRequires: autoconf
 BuildRequires: automake
 %{!?_without_sasl:BuildRequires:       cyrus-sasl-devel >= 2.1.0}
+%{!?_without_home_etc:BuildRequires:   home-etc-devel >= 1.0.3}
 BuildRequires: gettext-devel
 %{!?_with_slang:BuildRequires:         ncurses-devel >= 5.0}
-BuildRequires: openssl-devel >= 0.9.7
+#BuildRequires:        openssl-devel >= 0.9.7c
 BuildRequires: sgml-tools
 BuildRequires: sgml-tools-dtd
 %{?_with_slang:BuildRequires:          slang-devel}
+%{?_with_esmtp:BuildRequires:       libesmtp-devel}
 Requires:      iconv
 Requires:      mailcap
+%{!?_without_home_etc:Requires:        home-etc >= 1.0.3}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                specflags_ia32  "-fomit-frame-pointer"
@@ -121,7 +127,6 @@ Mutt - 
 
 %prep
 %setup -q -n %{name}-%(echo %{version} | sed 's/i$//')
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -141,6 +146,8 @@ Mutt - 
 %patch18 -p1
 %{!?_without_sasl:%patch19 -p1}
 %{?_with_nntp:%patch20 -p1}
+%{?_with_esmtp:%patch21 -p1}
+%{!?_without_home_etc:%patch22 -p1}
 
 # force regeneration (manual.sgml is modified by some patches)
 rm -f doc/{manual*.html,manual.txt}
@@ -163,6 +170,8 @@ rm -f doc/{manual*.html,manual.txt}
        %{?_with_nntp:--enable-nntp} \
        --with-regex \
        %{!?_without_sasl:--with-sasl} %{?_without_sasl:--without-sasl} \
+       %{!?_without_home_etc:--with-home-etc} %{?_without_home_etc:--without-home-etc} \
+    %{?_with_esmtp:--enable-libesmtp --with-libesmtp=/usr} \
        --with-ssl \
        --disable-warnings \
        --with-docdir=%{_docdir}/%{name}-%{version} \
@@ -180,14 +189,14 @@ 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}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 %{__patch} -p0 -d $RPM_BUILD_ROOT%{_sysconfdir} < %PATCH17
 
-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
 
@@ -203,7 +212,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 doc/manual.txt 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
@@ -211,7 +220,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pgp*
 %attr(2755,root,mail) %{_bindir}/mutt_dotlock
 
-%{_applnkdir}/Network/Mail/mutt.desktop
+%{_desktopdir}/*.desktop
 %{_pixmapsdir}/mutt.png
 %{_mandir}/man*/*
 %lang(pl) %{_mandir}/pl/man*/*