1.3.17i

Changed files:
    mutt.spec -> 1.67

diff --git a/mutt.spec b/mutt.spec
index 4fb7c1d909bb70ddcdd5ac69df78fb13f17be4fe..32693b4274abcfb510109b5c5ea28b622e310860 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -4,50 +4,25 @@ Summary(fr):  Agent courrier Mutt
 Summary(pl):   Program pocztowy Mutt
 Summary(tr):   Mutt elektronik posta programý
 Name:          mutt
-Version:       1.2.5i
-Release:       6
+Version:       1.3.17i
+Release:       1
 Epoch:         4
 License:       GPL
 Group:         Applications/Mail
 Group(de):     Applikationen/Post
 Group(pl):     Aplikacje/Poczta
 Group(pt):     Aplicações/Correio Eletrônico
-Source0:       ftp://ftp.mutt.org/pub/mutt/%{name}-%{version}.tar.gz
+Source0:       ftp://ftp.mutt.org/pub/mutt/devel/%{name}-%{version}.tar.gz
 Source1:       %{name}.desktop
-Source2:       patches_sec.txt
-Source3:       patches_bj.txt
-Source4:       %{name}.png
-#Patch0:       %{name}-mail.patch
-#Patch1:       %{name}-confdir.patch
-Patch2:                http://www.spinnaker.de/mutt/patch-1.2.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:                %{name}-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
-Patch12:       http://sec.42.org/mutt/patch-0.95.4.bj.status-time.1
-Patch14:       http://sec.42.org/mutt/patch-0.95.4.sec.keypad.1
-Patch16:       http://sec.42.org/mutt/patch-0.95.4.sec.reverse_reply.1
-Patch17:       http://sec.42.org/mutt/patch-0.95.4.vikas.print_index.1
-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
-#Patch24:      http://www.albedo.art.pl/~kbryd/mutt/%{name}_package.tar.gz
-Patch25:       %{name}-dot-lock.patch
-Patch26:       %{name}-pl.po.patch
-Patch27:       %{name}-nosetgid.patch
-Patch28:       %{name}-md5.patch
-Patch29:       %{name}-imap.patch
-Patch30:       %{name}-amfix.patch
+Source2:       %{name}.png
 URL:           http://www.mutt.org/
 Requires:      smtpdaemon
 Requires:      mailcap
+Requires:      iconv
+BuildRequires: iconv
 BuildRequires: ncurses-devel >= 5.0
 BuildRequires: openssl-devel
+BuildRequires: cyrus-sasl-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -81,50 +56,29 @@ deste
 
 %prep
 %setup -q -n %{name}-%(echo %{version} | sed 's/i$//')
-#%patch0 -p0
-#%patch1 -p1 
-%patch2 -p1 
-%patch3 -p1
-%patch4 -p1
-%patch7 -p1
-%patch9 -p0
-%patch10 -p0
-%patch12 -p1
-%patch14 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p0
-%patch20 -p1
-%patch22 -p1
-#%patch23 -p0
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
 
 %build
-aclocal
-autoconf
+aclocal -I m4
 automake -a -c
-CFLAGS="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS} -fno-strict-aliasing"
+autoheader
+autoconf
 %configure \
+       --with-curses \
+       --with-regex \
+       --with-homespool=Maildir \
+       --with-mailpath=/var/mail \
+       --enable-external-dotlock \
        --with-sharedir=%{_datadir} \
+       --with-iconv \
+       --with-docdir=%{_defaultdocdir}/%{name}-%{version} \
        --enable-pop \
        --enable-imap \
-       --with-curses \
-       --disable-warnings \
-       --disable-domain \
-        --enable-compressed \
-       --with-mailpath=/var/mail \
-       --with-homespool=Mailbox \
        --with-ssl \
-       --with-charmaps \
-       --with-docdir=%{_defaultdocdir}/%{name}-%{version} \
-       --enable-external-dotlock \
-       --enable-locales-fix
+       --with-sasl \
+       --disable-debug \
+       --disable-warnings \
+       --enable-mailtool \
+       --without-included-nls
 
 %{__make} keymap.h
 %{__make} 
@@ -136,13 +90,10 @@ install -d $RPM_BUILD_ROOT{%{_applnkdir}/Network/Mail,%{_pixmapsdir}}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/Mail
-install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir}
-
-install %{SOURCE2} %{SOURCE3} .
+install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 gzip -9nf contrib/{*rc*,*cap*} \
-       ChangeLog README TODO NEWS README.SECURITY README.SSL README.UPGRADE \
-       patches_{bj,sec}.txt
+       ChangeLog README TODO NEWS README.SECURITY README.SSL README.UPGRADE
 
 %find_lang %{name}
 
@@ -154,9 +105,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc *.gz contrib/{*rc*,*cap*} doc/manual*html
 %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/Muttrc
 %attr(755,root,root) %{_bindir}/mutt
-%attr(755,root,root) %{_bindir}/pgpewrap
-%attr(755,root,root) %{_bindir}/pgpring
-%attr(755,root,root) %{_bindir}/mutt_dotlock
+%attr(755,root,root) %{_bindir}/flea
+%attr(755,root,root) %{_bindir}/muttbug
+%attr(755,root,root) %{_bindir}/pgp*
+%attr(2754,root,mail) %{_bindir}/mutt_dotlock
 
 %{_applnkdir}/Network/Mail/mutt.desktop
 %{_pixmapsdir}/mutt.png