diff --git a/.gitignore b/.gitignore index 0bcd086..487387a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /alpine-2.25.tar.xz /alpine-2.26.tar.xz /alpine-2.26_new_upstream.tar.xz +/alpine-2.26_patched.tar.xz diff --git a/alpine.spec b/alpine.spec index 1824aba..81e9e6d 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,18 +6,19 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.26 -Release: 8%{?dist} +Release: 9%{?dist} License: Apache-2.0 URL: https://alpineapp.email/ -# alpine-2.26_new_upstream.tar.xz was generated from the new upstream location -# wget https://alpineapp.email/alpine/release/src/alpine-2.26.tar.xz -# mv alpine-2.26.tar.xz alpine_upstream-2.26.tar.xz +# alpine-2.26_new_patched.tar.xz was generated from the new upstream location +# wget https://alpineapp.email/alpine/patches/alpine-2.26/alpine-2.26.tar.xz +# mv alpine-2.26.tar.xz alpine_patched-2.26.tar.xz # alpine-2.26.tar.xz is slightly different between what Fedora has cached and # what is at the new upstream. The old location no longer exists # Clearly this shuffle should be removed as soon as a new release appears. -Source0: alpine-2.26_new_upstream.tar.xz +# Source0: https://alpineapp.email/alpine/patches/alpine-2.26/alpine-2.26.tar.xz +Source0: alpine-2.26_patched.tar.xz Source1: README.fedora Patch1: alpine-2.24-useragent.patch @@ -136,6 +137,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Sat Jun 22 2024 Steve Traylen - 2.26-9 +- Use patched upstream rhbz#2187297 + * Mon Jan 22 2024 Fedora Release Engineering - 2.26-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 07025d7..cca011a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alpine-2.26_new_upstream.tar.xz) = 359b5cb30be78a341b76c0475a2d5268b643788f14c9b5b9457af6748034e1d2e70fd7ddf59e5c59ad596a36d8a10afa9c41cbd74241c780b8575d8186168fd2 +SHA512 (alpine-2.26_patched.tar.xz) = e6c14f76bfa78d8d9295a80c6c98d0f6dc8c4d2fd70eac6c8cbd4454055d7a36911c0daf038dd4ff845adedaeff04cad80d3d150a0bd5c2902dca5ad5f563add