- hopefully fixed broken rr.compressed and php_hook patches, updated manual patch

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index a67a8a73de7d7b531166362f1ee85f76000305a3..8f2adc6a9b9042e6132077fad0abbb3b0c387ebb 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -18,7 +18,7 @@ Summary(tr):  Mutt elektronik posta program
 Summary(uk):   ðÏÛÔÏ×Á Ë̦¤ÎÔÓØËÁ ÐÒÏÇÒÁÍÁ Mutt
 Name:          mutt
 Version:       1.4.2.1
-Release:       0.2
+Release:       4
 Epoch:         6
 License:       GPL
 Group:         Applications/Mail
@@ -138,9 +138,11 @@ Mutt - 
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-#%patch12 -p1
-#%patch13 -p0
+%patch12 -p1
+# disabled - changes default behaviour
+##%patch13 -p0
 %patch14 -p1
+%patch15 -p1
 %patch16 -p1
 %patch17 -p1
 %{?with_sasl:%patch18 -p1}
@@ -155,6 +157,7 @@ rm -f doc/{manual*.html,manual.txt}
 %build
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
        %{!?debug:--disable-debug} %{?debug:--enable-debug} \
@@ -189,16 +192,17 @@ rm -f doc/{manual*.html,manual.txt}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1,%{_datadir}/%{name}}
 
 %{__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
+install doc/manual.txt $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 # conflict with qmail
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
@@ -212,7 +216,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 +224,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pgp*
 %attr(2755,root,mail) %{_bindir}/mutt_dotlock
 
+%{_datadir}/%{name}
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/mutt.png
 %{_mandir}/man*/*