From 8d4be78b8a9588356b2f2fe1c8b2cd454085ff1f Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 23 Feb 2024 23:50:23 +0000 Subject: [PATCH] Take advantage of new forge macros features [skip changelog] --- aerc.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/aerc.spec b/aerc.spec index 2665e8b..ce76671 100644 --- a/aerc.spec +++ b/aerc.spec @@ -7,8 +7,7 @@ # https://git.sr.ht/~rjarry/aerc %global goipath git.sr.ht/~rjarry/aerc -Version: 0.17.0 -%global topdir %{name}-%{version} +%global version0 0.17.0 %gometa @@ -17,6 +16,7 @@ Aerc is an email client that runs in your terminal. It is highly efficient and extensible, perfect for the discerning hacker.} Name: aerc +Version: %{forgeversion} Release: %autorelease Summary: Email client for your terminal @@ -24,9 +24,7 @@ SourceLicense: MIT # See LICENSES.dependencies License: MIT AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC URL: %{gourl} -# The forge macros don't support Sourcehut. -# https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/209 -Source0 %{gourl}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0 %{forgesource} Source1: aerc-%{version}-vendor.tar.gz # https://git.sr.ht/~gotmax23/fedora-scripts/tree/main/item/go-sig/go_vendor_licenses.py Source2: LICENSES.dependencies @@ -45,7 +43,7 @@ Requires: notmuch %{common_description} %prep -%autosetup -n %{topdir} -p1 %{?with_vendor:-b1} +%autosetup -p1 %{forgesetupargs} %{?with_vendor:-b1} %goprep -e %{?with_vendor:-k} cp %{SOURCE2} .