diff --git a/.gitignore b/.gitignore index 71a0b76..dcdc41a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ alpine-2.00.tar.bz2 +/re-alpine-2.02.tar.bz2 +/re-alpine-2.02-openssl.patch +/README.fedora diff --git a/alpine.spec b/alpine.spec index f30bc44..a6f1551 100644 --- a/alpine.spec +++ b/alpine.spec @@ -2,15 +2,14 @@ Summary: powerful, easy to use console email client Name: alpine -Version: 2.00 -Release: 9%{?dist} +Version: 2.02 +Release: 3%{?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 +Source1: README.fedora # Using "Conflicts" instead of Obsoletes because while alpine is substantially # compatible with pine the change to Unicode breaks important user @@ -26,12 +25,13 @@ 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 -Patch2: alpine-2.00-hunspell.patch +Provides: re-alpine = %{version}-%{release} -BuildRequires: automake libtool +## upstreamed patch: hopefully fix ftbfs openssl issues once and for all (sf bug #3027341) +# 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 +69,13 @@ GNU Build System's autotools. %prep -%setup -q +%setup -q -n re-alpine-%{version} -%patch1 -p1 -b .gcc44_reply_hack -%patch2 -p1 -b .hunspell +cp -p %{SOURCE1} . -# HACK to workaround local auto* wierdness outside of mock -export AUTOPOINT=/bin/true -autoreconf -f -i +%patch50 -p1 -b .openssl + +#autoreconf -f -i %build @@ -113,7 +112,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 @@ -129,6 +128,17 @@ rm -rf $RPM_BUILD_ROOT %changelog + +* Wed Dec 28 2011 Joshua Daniel Franklin 2.02-3 +- Add README.fedora (#427561) +- Remove short-term gcc workaround (#496400) + +* Mon Feb 07 2011 Fedora Release Engineering - 2.02-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Oct 08 2010 Rex Dieter - 2.02-1 +- re-alpine-2.02 (#465341) + * Mon Jul 19 2010 Rex Dieter - 2.00-9 - --with-npa=/usr/bin/inews - --with-smtp-msa=/usr/sbin/sendmail diff --git a/sources b/sources index b4072d9..a68222d 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -84e44cbf71ed674800a5d57eed9c1c52 alpine-2.00.tar.bz2 +5e75826b15f05674856be8618bdefdfb re-alpine-2.02.tar.bz2 +429c1862495acb23bb10879d4db04f91 re-alpine-2.02-openssl.patch +5b6f93ec7414c2a794480691a3beae24 README.fedora