From 055592e3bafa1f5eaf8c58eb5c32395aae05e544 Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Thu, 20 Dec 2012 23:25:50 -0500 Subject: [PATCH 1/4] Update to upstream release 2.03 --- .gitignore | 1 + alpine.spec | 18 +++++------------- sources | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index f4a010a..d2ef6e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ alpine-2.00.tar.bz2 /re-alpine-2.02.tar.bz2 +/re-alpine-2.03.tar.bz2 diff --git a/alpine.spec b/alpine.spec index 4225f76..f939789 100644 --- a/alpine.spec +++ b/alpine.spec @@ -2,8 +2,8 @@ Summary: powerful, easy to use console email client Name: alpine -Version: 2.02 -Release: 4%{?dist} +Version: 2.03 +Release: 1%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -26,14 +26,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Provides: re-alpine = %{version}-%{release} -# short-term workaround until gcc is fixed -# http://bugzilla.redhat.com/496400 -Patch1: alpine-2.00-gcc44_reply_hack.patch - -## upstreamable patches -# this one maybe already, recall grumblings onlinst awhile back -- Rex -Patch50: re-alpine-2.02-openssl.patch - #BuildRequires: automake libtool BuildRequires: gettext BuildRequires: hunspell @@ -74,9 +66,6 @@ GNU Build System's autotools. %prep %setup -q -n re-alpine-%{version} -%patch1 -p1 -b .gcc44_reply_hack -%patch50 -p1 -b .openssl - #autoreconf -f -i @@ -130,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Dec 20 2012 Joshua Daniel Franklin 2.03-1 +- re-alpine-2.03 (#880328,#888204) + * Wed Jul 18 2012 Fedora Release Engineering - 2.02-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 8d6ff1a..2703c80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e75826b15f05674856be8618bdefdfb re-alpine-2.02.tar.bz2 +566d269d4bd43aba68f377110a6295d5 re-alpine-2.03.tar.bz2 From 96565eab525f9811ee2df217205d97ffc270bbf3 Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Thu, 20 Dec 2012 23:48:41 -0500 Subject: [PATCH 2/4] Add README.fedora --- .gitignore | 1 + alpine.spec | 9 +++++++-- sources | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d2ef6e0..0baf649 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ alpine-2.00.tar.bz2 /re-alpine-2.02.tar.bz2 /re-alpine-2.03.tar.bz2 +/README.fedora diff --git a/alpine.spec b/alpine.spec index f939789..9f90915 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,12 +3,14 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.03 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 Group: Applications/Internet URL: http://re-alpine.sourceforge.net/ Source0: http://downloads.sourceforge.net/sourceforge/re-alpine/re-alpine-%{version}%{?pre}.tar.bz2 +Source1: README.fedora + # Using "Conflicts" instead of Obsoletes because while alpine is substantially # compatible with pine the change to Unicode breaks important user @@ -103,7 +105,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README LICENSE doc/tech-notes.txt +%doc README.fedora README LICENSE doc/tech-notes.txt %ghost %config(noreplace) %{_sysconfdir}/pine.conf %ghost %config(noreplace) %{_sysconfdir}/pine.conf.fixed %{_bindir}/alpine @@ -119,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Dec 20 2012 Joshua Daniel Franklin 2.03-2 +- add README.fedora + * Thu Dec 20 2012 Joshua Daniel Franklin 2.03-1 - re-alpine-2.03 (#880328,#888204) diff --git a/sources b/sources index 2703c80..b5c5f32 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +5b6f93ec7414c2a794480691a3beae24 README.fedora 566d269d4bd43aba68f377110a6295d5 re-alpine-2.03.tar.bz2 From 0f2052eae54a882dbf133a4d62158b2ce632a06c Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Fri, 21 Dec 2012 00:36:18 -0500 Subject: [PATCH 3/4] Add README.fedora --- alpine.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/alpine.spec b/alpine.spec index 9f90915..fd7ebbe 100644 --- a/alpine.spec +++ b/alpine.spec @@ -68,6 +68,8 @@ GNU Build System's autotools. %prep %setup -q -n re-alpine-%{version} +cp -p %{SOURCE1} . + #autoreconf -f -i From d0f882c930014935f0cc0920344c02db0ee908ec Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 6 Nov 2013 12:20:52 -0600 Subject: [PATCH 4/4] alpine-2.11, drop old/unused patches --- .gitignore | 1 + alpine-2.00-gcc44_reply_hack.patch | 11 ----------- alpine.spec | 9 ++++++--- re-alpine-2.02-openssl.patch | 12 ------------ sources | 2 +- 5 files changed, 8 insertions(+), 27 deletions(-) delete mode 100644 alpine-2.00-gcc44_reply_hack.patch delete mode 100644 re-alpine-2.02-openssl.patch diff --git a/.gitignore b/.gitignore index c32062f..d0be0ce 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ alpine-2.00.tar.bz2 /re-alpine-2.02.tar.bz2 /re-alpine-2.03.tar.bz2 /alpine-2.10.clean.tar.lzma +/alpine-2.11.tar.xz diff --git a/alpine-2.00-gcc44_reply_hack.patch b/alpine-2.00-gcc44_reply_hack.patch deleted file mode 100644 index 9fc0f50..0000000 --- a/alpine-2.00-gcc44_reply_hack.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 e6d4cbd..58a74e8 100644 --- a/alpine.spec +++ b/alpine.spec @@ -2,8 +2,8 @@ Summary: powerful, easy to use console email client Name: alpine -Version: 2.10 -Release: 4%{?dist} +Version: 2.11 +Release: 1%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -11,7 +11,7 @@ Group: Applications/Internet #URL: http://re-alpine.sourceforge.net/ #Source0: http://downloads.sourceforge.net/sourceforge/re-alpine/re-alpine-%{version}%{?pre}.tar.bz2 URL: http://patches.freeiz.com/alpine/info/alpine.html -Source0: http://patches.freeiz.com/alpine/patches/alpine-2.10/alpine-%{version}.clean.tar.lzma +Source0: http://patches.freeiz.com/alpine/patches/alpine-%{version}/alpine-%{version}.tar.xz Source1: README.fedora # Using "Conflicts" instead of Obsoletes because while alpine is substantially @@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Nov 06 2013 Rex Dieter 2.11-1 +- alpine-2.11, drop old/unused patches + * Thu Oct 31 2013 Rex Dieter 2.10-4 - re-add README.fedora diff --git a/re-alpine-2.02-openssl.patch b/re-alpine-2.02-openssl.patch deleted file mode 100644 index 98e8d31..0000000 --- a/re-alpine-2.02-openssl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up re-alpine-2.02/pith/smkeys.c.openssl re-alpine-2.02/pith/smkeys.c ---- re-alpine-2.02/pith/smkeys.c.openssl 2010-10-02 03:37:57.000000000 -0500 -+++ re-alpine-2.02/pith/smkeys.c 2010-10-08 14:44:57.068382616 -0500 -@@ -277,7 +277,7 @@ char * - get_x509_subject_email(X509 *x) - { - char *result = NULL; --#if OPENSSL_VERSION_NUMBER >= 0x1000000f /* OpenSSL 1.0.0 */ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L /* OpenSSL 1.0.0 */ - STACK_OF(OPENSSL_STRING) *emails; - #else /* OpenSSL 0.x and 1.0.0-dev/beta */ - STACK *emails; diff --git a/sources b/sources index b63ba62..b93e6d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -727a6eaa577857b98ea74fac6ea42a25 alpine-2.10.clean.tar.lzma +522b582855fed048d3dea2c5fe1e23a4 alpine-2.11.tar.xz