diff --git a/.gitignore b/.gitignore index 6918a0d..0bcd086 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /alpine-2.24.tar.xz /alpine-2.25.tar.xz /alpine-2.26.tar.xz +/alpine-2.26_new_upstream.tar.xz diff --git a/alpine.spec b/alpine.spec index 1e05f22..f4fc0e1 100644 --- a/alpine.spec +++ b/alpine.spec @@ -9,8 +9,15 @@ Version: 2.26 Release: 5%{?dist} License: ASL 2.0 -URL: http://alpine.x10host.com/ -Source0: http://alpine.x10host.com/alpine/patches/alpine-%{version}/alpine-%{version}.tar.xz +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.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 Source1: README.fedora Patch1: alpine-2.24-useragent.patch @@ -130,6 +137,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog * Fri May 5 2023 Steve Traylen - 2.26-5 +- Switch to new alineapp.email upstream (rhbz#2187297) - Build with one CPU thread - Use modern patch macros diff --git a/sources b/sources index db13476..07025d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alpine-2.26.tar.xz) = e9b13a225593a8a346b2ed3ece53db99f69ffce45783ce5037a813b6962f5b9f72c593b3252d7c079748384aa68d13702f783ef259d222d6490cc57b2e82c9ce +SHA512 (alpine-2.26_new_upstream.tar.xz) = 359b5cb30be78a341b76c0475a2d5268b643788f14c9b5b9457af6748034e1d2e70fd7ddf59e5c59ad596a36d8a10afa9c41cbd74241c780b8575d8186168fd2