- massive change: BR openssl-devel >= 0.9.7d

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index d0cf9ed3b06cc7fe36902cd795d9901f5050f373..1cbe6a704652db01458b5cc62ce66c70c5c9ea17 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,10 +1,10 @@
 #
 # 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_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
@@ -18,7 +18,7 @@ Summary(tr):  Mutt elektronik posta program
 Summary(uk):   ðÏÛÔÏ×Á Ë̦¤ÎÔÓØËÁ ÐÒÏÇÒÁÍÁ Mutt
 Name:          mutt
 Version:       1.4.2.1
-Release:       4
+Release:       6
 Epoch:         6
 License:       GPL
 Group:         Applications/Mail
@@ -49,6 +49,7 @@ Patch19:      %{name}-nntp.patch
 Patch20:       %{name}-esmtp.patch
 Patch21:       %{name}-home_etc.patch
 Patch22:       %{name}-kill_warnings.patch
+Patch23:       %{name}-Muttrc_mbox_path.patch
 URL:           http://www.mutt.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -56,8 +57,8 @@ BuildRequires:        automake
 %{?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: 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}
@@ -139,7 +140,8 @@ Mutt - 
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-#%patch13 -p0
+# disabled - changes default behaviour
+##%patch13 -p0
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
@@ -149,6 +151,7 @@ Mutt - 
 %{?with_esmtp:%patch20 -p1}
 %{?with_home_etc:%patch21 -p1}
 %patch22 -p1
+%patch23 -p1
 
 # force regeneration (manual.sgml is modified by some patches)
 rm -f doc/{manual*.html,manual.txt}
@@ -156,6 +159,7 @@ rm -f doc/{manual*.html,manual.txt}
 %build
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
        %{!?debug:--disable-debug} %{?debug:--enable-debug} \
@@ -175,7 +179,7 @@ rm -f doc/{manual*.html,manual.txt}
        %{?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} \
@@ -190,17 +194,20 @@ rm -f doc/{manual*.html,manual.txt}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1,%{_datadir}/%{name}}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__patch} -p0 -d $RPM_BUILD_ROOT%{_sysconfdir} < %PATCH16
+%{__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}
+
+# 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*
@@ -214,7 +221,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 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
@@ -222,7 +229,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pgp*
 %attr(2755,root,mail) %{_bindir}/mutt_dotlock
 
-%{_datadir}/%{name}
+%{_docdir}/%{name}
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/mutt.png
 %{_mandir}/man*/*