From 3fd7aa8dd67ac69e1fa02e8d03a617f93a5c1a73 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 04:55:21 +0000 Subject: [PATCH 1/4] Initialize branch F-11 for alpine --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 327711f36faad1a41fcc9996273f3451690ee939 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 6 May 2009 13:44:26 +0000 Subject: [PATCH 2/4] - "reply to all recipients" doesn't include anyone on the Cc list (#496400) --- alpine-2.00-gcc44_reply_hack.patch | 11 +++++++++++ alpine.spec | 13 ++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 alpine-2.00-gcc44_reply_hack.patch diff --git a/alpine-2.00-gcc44_reply_hack.patch b/alpine-2.00-gcc44_reply_hack.patch new file mode 100644 index 0000000..9fc0f50 --- /dev/null +++ b/alpine-2.00-gcc44_reply_hack.patch @@ -0,0 +1,11 @@ +diff -up alpine-2.00/pith/reply.c.gcc44 alpine-2.00/pith/reply.c +--- alpine-2.00/pith/reply.c.gcc44 2008-06-03 14:27:23.000000000 -0500 ++++ alpine-2.00/pith/reply.c 2009-05-06 08:07:27.000000000 -0500 +@@ -357,6 +357,7 @@ set_role_from_msg(struct pine *ps, long + * reply_seed - fill in reply header + * + */ ++__attribute__((__optimize__(0))) + void + reply_seed(struct pine *ps, ENVELOPE *outgoing, ENVELOPE *env, + struct mail_address *saved_from, struct mail_address *saved_to, diff --git a/alpine.spec b/alpine.spec index 3f8a593..90aa8a6 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,7 +3,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.00 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -26,6 +26,10 @@ Source0: ftp://ftp.cac.washington.edu/alpine/alpine-%{version}.tar.bz2 Conflicts: pine BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +# short-term workaround until gcc is fixed +# http://bugzilla.redhat.com/496400 +Patch1: alpine-2.00-gcc44_reply_hack.patch + BuildRequires: aspell BuildRequires: gettext BuildRequires: inews @@ -63,6 +67,10 @@ GNU Build System's autotools. %prep %setup -q +#if 0%{?fedora} > 10 +%patch1 -p1 -b .gcc44_reply_hack +#endif + %build touch imap/ip6 @@ -111,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 06 2009 Rex Dieter - 2.00-5 +- "reply to all recipients" doesn't include anyone on the Cc list (#496400) + * Mon Feb 23 2009 Fedora Release Engineering - 2.00-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 31762980f67e9008c9af82ebabe0a587ae348428 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:38 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 19cd451..ea7d2a7 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: alpine -# $Id$ +# $Id: Makefile,v 1.1 2007/09/07 18:23:34 kevin Exp $ NAME := alpine SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From f9e8d686b3945ebfb9e1a60ffff03cdceccbabb9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:44:25 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ea7d2a7..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alpine -# $Id: Makefile,v 1.1 2007/09/07 18:23:34 kevin Exp $ -NAME := alpine -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11