From f302a9fe76d11e39be3cba041dfa5f8d9591ae90 Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Thu, 20 Dec 2012 22:43:30 -0500 Subject: [PATCH 1/7] Update to upstream release 2.03 --- .gitignore | 1 + alpine.spec | 15 ++------------- sources | 2 +- 3 files changed, 4 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 78bec88..6208203 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: 3%{?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 diff --git a/sources b/sources index 8d6ff1a..84d4481 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e75826b15f05674856be8618bdefdfb re-alpine-2.02.tar.bz2 +9a72c4586514d543ee5cbad22796ca61 re-alpine-2.03.tar.bz2 From badd78c490d9a21658f7e8818e01eacb4337e67c Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Thu, 20 Dec 2012 23:15:21 -0500 Subject: [PATCH 2/7] Update to upstream release 2.03 --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 84d4481..2703c80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a72c4586514d543ee5cbad22796ca61 re-alpine-2.03.tar.bz2 +566d269d4bd43aba68f377110a6295d5 re-alpine-2.03.tar.bz2 From d6d50855a584ee32643cb51d702275674c1557f5 Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Thu, 20 Dec 2012 23:17:13 -0500 Subject: [PATCH 3/7] Update to upstream release 2.03 --- alpine.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/alpine.spec b/alpine.spec index 6208203..7222709 100644 --- a/alpine.spec +++ b/alpine.spec @@ -119,6 +119,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Dec 20 2012 Joshua Daniel Franklin 2.03-1 +- re-alpine-2.03 (#880328,#888204) + +- http://www.redhat.com/archives/fedora-devel-list/2008-November/msg01484.html * Thu Jan 12 2012 Fedora Release Engineering - 2.02-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 01fc0e41e80647142f67c3e3c271b5613c742e1b Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Thu, 20 Dec 2012 23:46:49 -0500 Subject: [PATCH 4/7] Add README.fedora --- .gitignore | 1 + alpine.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 3 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 7222709..fb1e84f 100644 --- a/alpine.spec +++ b/alpine.spec @@ -9,6 +9,8 @@ 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,10 +121,15 @@ 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) -- http://www.redhat.com/archives/fedora-devel-list/2008-November/msg01484.html +* Wed Jul 18 2012 Fedora Release Engineering - 2.02-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Jan 12 2012 Fedora Release Engineering - 2.02-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 2703c80..b4707d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -566d269d4bd43aba68f377110a6295d5 re-alpine-2.03.tar.bz2 +5b6f93ec7414c2a794480691a3beae24 README.fedora From 6b1070b7743d1100c42e56568aa872a8bc2ff151 Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Thu, 20 Dec 2012 23:47:12 -0500 Subject: [PATCH 5/7] Add README.fedora --- alpine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index fb1e84f..9f90915 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,7 +3,7 @@ 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 From 2547c2e1b7065de8d8fb692684b21905851abd03 Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Thu, 20 Dec 2012 23:49:32 -0500 Subject: [PATCH 6/7] Fix sources --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index b4707d7..b5c5f32 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 5b6f93ec7414c2a794480691a3beae24 README.fedora +566d269d4bd43aba68f377110a6295d5 re-alpine-2.03.tar.bz2 From d8b40e0e59a71fcb05f20036b3f04d71f10fcb24 Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Fri, 21 Dec 2012 00:17:07 -0500 Subject: [PATCH 7/7] 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