Accepting request 148397 from server:mail

- Remove spurious blank line from new patch to make older patch(1)
  also work with this
- Make it build with older products

OBS-URL: https://build.opensuse.org/request/show/148397
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutt?expand=0&rev=51
This commit is contained in:
Stephan Kulow 2013-01-14 21:24:09 +00:00 committed by Git OBS Bridge
commit fcff7456bb
3 changed files with 281 additions and 268 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jan 14 09:11:05 UTC 2013 - werner@suse.de
- Remove spurious blank line from new patch to make older patch(1)
also work with this
- Make it build with older products
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 18 16:26:45 UTC 2012 - aginies@suse.com Tue Dec 18 16:26:45 UTC 2012 - aginies@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package mutt # spec file for package mutt
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,6 @@ Name: mutt
#!BuildIgnore: sendmail #!BuildIgnore: sendmail
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: automake
BuildRequires: cyrus-sasl-devel BuildRequires: cyrus-sasl-devel
BuildRequires: cyrus-sasl-gssapi BuildRequires: cyrus-sasl-gssapi
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
@ -82,7 +81,7 @@ Patch2: %name-1.5.9i-pgpewrap.diff
Patch3: %name-1.5.20-sendgroupreplyto.diff Patch3: %name-1.5.20-sendgroupreplyto.diff
Patch4: %name-1.5.15-wrapcolumn.diff Patch4: %name-1.5.15-wrapcolumn.diff
Patch5: patch-1.5.5.1.nt.xtitles.3.ab.1 Patch5: patch-1.5.5.1.nt.xtitles.3.ab.1
# http://lunar-linux.org/index.php?page=mutt-sidebar # http://lunar-linux.org/mutt-sidebar
Patch6: mutt-1.5.21.sidebar.20120829.patch Patch6: mutt-1.5.21.sidebar.20120829.patch
Patch7: mutt-1.5.21-opennfs.dif Patch7: mutt-1.5.21-opennfs.dif
Patch8: mutt-1.5.20-gpgme_set_locale.patch Patch8: mutt-1.5.20-gpgme_set_locale.patch
@ -128,7 +127,9 @@ cp doc/Muttrc Muttrc.SuSE
cp %{S:2} . cp %{S:2} .
%build %build
%if 0%{?suse_version} > 1100
autoreconf -fi autoreconf -fi
%endif
CC=gcc CC=gcc
CFLAGS="-Wall $RPM_OPT_FLAGS -I. -D_GNU_SOURCE -fno-strict-aliasing" CFLAGS="-Wall $RPM_OPT_FLAGS -I. -D_GNU_SOURCE -fno-strict-aliasing"
CFLAGS="$CFLAGS -fstack-protector" CFLAGS="$CFLAGS -fstack-protector"
@ -145,7 +146,9 @@ chmod 755 $KRB5CFGPATH
--enable-imap \ --enable-imap \
--enable-pop \ --enable-pop \
--enable-pgp \ --enable-pgp \
%if 0%{?suse_version} >= 1100
--enable-gpgme \ --enable-gpgme \
%endif
--enable-nfs-fix \ --enable-nfs-fix \
--enable-mailtool \ --enable-mailtool \
--enable-compressed \ --enable-compressed \