for mutt 1.2i

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index 92eab2cda762c2e2aba016a8bc8bce11e29ca573..bb5d4132ad523e281998c058f0873931d3b87010 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -4,22 +4,23 @@ Summary(fr):  Agent courrier Mutt
 Summary(pl):   Program pocztowy Mutt
 Summary(tr):   Mutt elektronik posta programý
 Name:          mutt
-Version:       1.1.11i
-Release:       2
+Version:       1.2i
+Release:       1
 License:       GPL
 Group:         Applications/Mail
 Group(pt):     Aplicações/Correio Eletrônico
 Group(pl):     Aplikacje/Poczta
-Source0:       ftp://riemann.iam.uni-bonn.de/pub/mutt/%{name}-%{version}.tar.gz
+Source0:       ftp://ftp.mutt.org/pub/mutt/%{name}-%{version}.tar.gz
 Source1:       mutt.desktop
 Source2:       patches_sec.txt
 Source3:       patches_bj.txt
 Patch0:                mutt-mail.patch
 #Patch1:       mutt-confdir.patch
-Patch2:                http://www.spinnaker.de/mutt/patch-1.1.10.rr.compressed.1.gz
+Patch2:                http://www.spinnaker.de/mutt/patch-1.1.12.rr.compressed.1.gz
 # Part of that patches I changed by hand to fit them into newer version
 # (bonkey)
 Patch3:                patch-0.00.sec+bonk.patchlist.1
+Patch4:                mutt-blanklines.patch
 Patch7:                http://sec.42.org/mutt/patch-0.94.7.sec.previous_jump.1
 Patch9:                http://sec.42.org/mutt/patch-0.94.7.vikas.word_chars.1
 Patch10:       http://sec.42.org/mutt/patch-0.95.3.bj.ed_mtime.1
@@ -31,8 +32,9 @@ Patch18:      http://sec.42.org/mutt/patch-0.95.6.as.mark-old.1
 Patch19:       http://sec.42.org/mutt/patch-0.95.bj.hash_destroy.2
 Patch20:       http://sec.42.org/mutt/patch-0.95.sec.condense_pgp.1
 Patch22:       http://sec.42.org/mutt/patch-1.02.sec._A.1
-Patch23:       http://www.murkworks.to/blank-line.patch
+#Patch23:      http://www.murkworks.to/blank-line.patch
 #Patch24:      http://www.albedo.art.pl/~kbryd/mutt/mutt_package.tar.gz
+Patch25:       mutt-dot-lock.patch
 URL:           http://www.mutt.org/
 Requires:      smtpdaemon
 Requires:      mailcap
@@ -69,9 +71,10 @@ deste
 %prep
 %setup -q -n %{name}-%(echo %{version} | sed 's/i$//')
 %patch0 -p0
-# %patch1 -p1 
+#%patch1 -p1 
 %patch2 -p1 
 %patch3 -p1
+%patch4 -p1
 %patch7 -p1
 %patch9 -p0
 %patch10 -p0
@@ -83,11 +86,16 @@ deste
 %patch19 -p0
 %patch20 -p1
 %patch22 -p1
-%patch23 -p0
+#%patch23 -p0
+%patch25 -p1
 
 %build
+mv aclocal.m4 acinclude.m4
+aclocal
+automake
+autoconf
 CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-LDFLAGS="-s"
+LDFLAGS=""
 export CFLAGS LDFLAGS
 %configure \
        --with-sharedir=%{_datadir} \
@@ -96,10 +104,11 @@ export CFLAGS LDFLAGS
        --with-curses \
        --disable-warnings \
        --disable-domain \
+        --enable-compressed \
+       --with-mailpath=/var/mail \
+       --with-homespool=Mailbox \
        --with-ssl \
        --with-charmaps \
-       --with-homespool=Mailbox \
-       --enable-compressed \
        --with-docdir=%{_defaultdocdir}/%{name}-%{version}
 
 make keymap.h
@@ -115,7 +124,7 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Networking/Mail
 install %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/%{_docdir}
 
 gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/* \
-       contrib/{*rc,*cap} \
+       contrib/{*rc*,*cap*} \
        ChangeLog README TODO NEWS README.SECURITY README.SSL README.UPGRADE \
        $RPM_BUILD_ROOT%{_docdir}/patches_{bj,sec}.txt
 
@@ -127,6 +136,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc {ChangeLog,README,TODO,NEWS,README.SECURITY,README.SSL,README.UPGRADE}.gz
+%doc contrib/{*rc*,*cap*}
 %doc doc/manual*html
 %doc doc/patches_{bj,sec}.txt.gz