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