diff --git a/.gitignore b/.gitignore index f4a010a..fb9b4d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ alpine-2.00.tar.bz2 /re-alpine-2.02.tar.bz2 +/README.fedora +/re-alpine-2.03.tar.bz2 diff --git a/alpine.spec b/alpine.spec index 4225f76..fd7ebbe 100644 --- a/alpine.spec +++ b/alpine.spec @@ -2,13 +2,15 @@ Summary: powerful, easy to use console email client Name: alpine -Version: 2.02 -Release: 4%{?dist} +Version: 2.03 +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 @@ -26,14 +28,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,8 +68,7 @@ GNU Build System's autotools. %prep %setup -q -n re-alpine-%{version} -%patch1 -p1 -b .gcc44_reply_hack -%patch50 -p1 -b .openssl +cp -p %{SOURCE1} . #autoreconf -f -i @@ -114,7 +107,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 @@ -130,6 +123,12 @@ 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) + * 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..b5c5f32 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -5e75826b15f05674856be8618bdefdfb re-alpine-2.02.tar.bz2 +5b6f93ec7414c2a794480691a3beae24 README.fedora +566d269d4bd43aba68f377110a6295d5 re-alpine-2.03.tar.bz2