[alpine] - re-alpine-2.02 (#465341)

[Rex Dieter]

commit a150d08361d06925c397e64e1f2508ad683a8fc6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 8 14:51:19 2010 -0500

    - re-alpine-2.02 (#465341)

 .gitignore                   |    1 +
 alpine-2.00-hunspell.patch   |  104 ------------------------------------------
 alpine.spec                  |   30 +++++++-----
 re-alpine-2.02-openssl.patch |   12 +++++
 sources                      |    2 +-
 5 files changed, 31 insertions(+), 118 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 71a0b76..f4a010a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 alpine-2.00.tar.bz2
+/re-alpine-2.02.tar.bz2
diff --git a/alpine.spec b/alpine.spec
index f30bc44..e05560d 100644
--- a/alpine.spec
+++ b/alpine.spec
@@ -2,15 +2,13 @@
 
 Summary: powerful, easy to use console email client
 Name: alpine
-Version: 2.00 
-Release: 9%{?dist}
+Version: 2.02
+Release: 1%{?dist}
 
 License: ASL 2.0
 Group: Applications/Internet
-URL: http://www.washington.edu/alpine
-# FTP: ftp://ftp.cac.washington.edu/alpine/
-# SVN: https://svn.cac.washington.edu/public/alpine/snapshots/
-Source0: ftp://ftp.cac.washington.edu/alpine/alpine-%{version}.tar.bz2
+URL: http://re-alpine.sourceforge.net/ 
+Source0:  http://downloads.sourceforge.net/sourceforge/re-alpine/re-alpine-%{version}%{?pre}.tar.bz2
 
 # Using "Conflicts" instead of Obsoletes because while alpine is substantially
 # compatible with pine the change to Unicode breaks important user
@@ -26,12 +24,17 @@ Source0: ftp://ftp.cac.washington.edu/alpine/alpine-%{version}.tar.bz2
 Conflicts: pine
 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
-Patch2: alpine-2.00-hunspell.patch
 
-BuildRequires: automake libtool
+## 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
 ## passing --with-npa=/usr/bin/inews
@@ -69,14 +72,12 @@ GNU Build System's autotools.
 
 
 %prep
-%setup -q
+%setup -q -n re-alpine-%{version}
 
 %patch1 -p1 -b .gcc44_reply_hack
-%patch2 -p1 -b .hunspell
+%patch50 -p1 -b .openssl
 
-# HACK to workaround local auto* wierdness outside of mock
-export AUTOPOINT=/bin/true
-autoreconf -f -i
+#autoreconf -f -i
 
 
 %build
@@ -129,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.02-1
+- re-alpine-2.02 (#465341)
+
 * Mon Jul 19 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.00-9
 - --with-npa=/usr/bin/inews
 - --with-smtp-msa=/usr/sbin/sendmail
diff --git a/re-alpine-2.02-openssl.patch b/re-alpine-2.02-openssl.patch
new file mode 100644
index 0000000..98e8d31
--- /dev/null
+++ b/re-alpine-2.02-openssl.patch
@@ -0,0 +1,12 @@
+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 b4072d9..8d6ff1a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-84e44cbf71ed674800a5d57eed9c1c52  alpine-2.00.tar.bz2
+5e75826b15f05674856be8618bdefdfb  re-alpine-2.02.tar.bz2