diff --git a/automake-1.12.patch b/automake-1.12.patch new file mode 100644 index 0000000..0333b62 --- /dev/null +++ b/automake-1.12.patch @@ -0,0 +1,12 @@ +Index: mutt-1.5.21/configure.ac +=================================================================== +--- mutt-1.5.21.orig/configure.ac ++++ mutt-1.5.21/configure.ac +@@ -27,7 +27,6 @@ AC_MSG_RESULT($mutt_cv_prefix) + + AC_PROG_CC + AC_ISC_POSIX +-AM_C_PROTOTYPES + if test "x$U" != "x"; then + AC_MSG_ERROR(Compiler not ANSI compliant) + fi diff --git a/mutt.changes b/mutt.changes index d9fa642..a0deb2c 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 29 14:10:05 UTC 2012 - puzel@suse.com + +- fix build with automake-1.12 + - add: automake-1.12.patch + ------------------------------------------------------------------- Fri Apr 13 12:58:09 UTC 2012 - multiple1902@gmail.com diff --git a/mutt.spec b/mutt.spec index b03c07c..751b1f5 100644 --- a/mutt.spec +++ b/mutt.spec @@ -1,7 +1,7 @@ # # spec file for package mutt # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,8 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: mutt #!BuildIgnore: sendmail +BuildRequires: autoconf +BuildRequires: automake BuildRequires: automake BuildRequires: cyrus-sasl-devel BuildRequires: cyrus-sasl-gssapi @@ -39,7 +42,6 @@ BuildRequires: postfix BuildRequires: sgml-skel BuildRequires: update-desktop-files BuildRequires: xli -BuildRequires: autoconf automake #if %if 0%{?suse_version} > 1130 BuildRequires: libassuan-devel @@ -47,8 +49,6 @@ BuildRequires: libgpgme-devel %else BuildRequires: gpgme-devel %endif -License: GPL-2.0+ -Group: Productivity/Networking/Email/Clients Url: http://www.mutt.org Provides: muttssl Obsoletes: muttssl @@ -63,6 +63,8 @@ Requires(postun): shared-mime-info Version: 1.5.21 Release: 0 Summary: Mail Program +License: GPL-2.0+ +Group: Productivity/Networking/Email/Clients # ftp://ftp.mutt.org/mutt/devel/ Source0: %name-%version.tar.bz2 Source1: Signature_conversion @@ -91,6 +93,7 @@ Patch12: mutt-1.5.21-tinfo.dif # http://www.wolfermann.org/mutt.html Patch13: aw.listreply.diff Patch14: patch-1.5.21.vk.pgp_verbose_mime +Patch15: automake-1.12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -121,6 +124,7 @@ done %patch12 -p0 -b .tinfo %patch13 -p1 -b .listreply %patch14 -p1 +%patch15 -p1 cp doc/Muttrc Muttrc.SuSE cp %{S:2} . @@ -192,7 +196,7 @@ install -D -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/skel/.muttrc %suse_update_desktop_file mutt #%fdupes %{buildroot} - + %if 0%{?suse_version} >= 1140 %post