From d12b0a23968edb7faa5cd06dedb831f1ba4d5558 Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Tue, 7 Jul 2015 01:22:10 +0000 Subject: [PATCH 1/2] Update to upstream alpine-2.20.tar.xz --- .gitignore | 1 + alpine.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d0be0ce..8f7d111 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ alpine-2.00.tar.bz2 /re-alpine-2.03.tar.bz2 /alpine-2.10.clean.tar.lzma /alpine-2.11.tar.xz +/alpine-2.20.tar.xz diff --git a/alpine.spec b/alpine.spec index 7c19cf6..2b8134d 100644 --- a/alpine.spec +++ b/alpine.spec @@ -2,8 +2,8 @@ Summary: powerful, easy to use console email client Name: alpine -Version: 2.11 -Release: 3%{?dist} +Version: 2.20 +Release: 1%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -109,7 +109,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README LICENSE doc/tech-notes.txt +%doc README LICENSE %doc README.fedora %ghost %config(noreplace) %{_sysconfdir}/pine.conf %ghost %config(noreplace) %{_sysconfdir}/pine.conf.fixed @@ -126,6 +126,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 06 2015 Joshua Daniel Franklin 2.20-1 +- Build from new upstream for 2.10, fixes rhbz#1092688 rhbz#1142890 + +* Tue Jun 16 2015 Fedora Release Engineering - 2.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Aug 15 2014 Fedora Release Engineering - 2.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index b93e6d2..937a499 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -522b582855fed048d3dea2c5fe1e23a4 alpine-2.11.tar.xz +043b67666af73b26f9627ad97e2aaf92 alpine-2.20.tar.xz From 06da6b36d3de45b493e2ffcacc54dfcc99eef207 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 9 Oct 2015 13:00:55 -0500 Subject: [PATCH 2/2] Revert "Update to upstream alpine-2.20.tar.xz" This reverts commit d12b0a23968edb7faa5cd06dedb831f1ba4d5558. --- .gitignore | 1 - alpine.spec | 12 +++--------- sources | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 8f7d111..d0be0ce 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ alpine-2.00.tar.bz2 /re-alpine-2.03.tar.bz2 /alpine-2.10.clean.tar.lzma /alpine-2.11.tar.xz -/alpine-2.20.tar.xz diff --git a/alpine.spec b/alpine.spec index 2b8134d..7c19cf6 100644 --- a/alpine.spec +++ b/alpine.spec @@ -2,8 +2,8 @@ Summary: powerful, easy to use console email client Name: alpine -Version: 2.20 -Release: 1%{?dist} +Version: 2.11 +Release: 3%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -109,7 +109,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README LICENSE +%doc README LICENSE doc/tech-notes.txt %doc README.fedora %ghost %config(noreplace) %{_sysconfdir}/pine.conf %ghost %config(noreplace) %{_sysconfdir}/pine.conf.fixed @@ -126,12 +126,6 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Jul 06 2015 Joshua Daniel Franklin 2.20-1 -- Build from new upstream for 2.10, fixes rhbz#1092688 rhbz#1142890 - -* Tue Jun 16 2015 Fedora Release Engineering - 2.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - * Fri Aug 15 2014 Fedora Release Engineering - 2.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 937a499..b93e6d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -043b67666af73b26f9627ad97e2aaf92 alpine-2.20.tar.xz +522b582855fed048d3dea2c5fe1e23a4 alpine-2.11.tar.xz