On Fri Feb 3, 2023 at 01:42 +0000, Maxwell G wrote:
> (see the attachment)
Here it is!
--
Maxwell G (@gotmax23)
Pronouns: He/Him/His
diff --git a/blocker.patch b/blocker.patch
new file mode 100644
index 0000000..76999f4
--- /dev/null
+++ b/blocker.patch
@@ -0,0 +1,24 @@
+From 90303acd82a190711f6b902a25341dff459780ca Mon Sep 17 00:00:00 2001
+From: Maxwell G <gotmax@e.email>
+Date: Sat, 21 Jan 2023 18:16:39 -0600
+Subject: [PATCH] blocker
+
+---
+ rpm/macros.d/macros.go-srpm | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/rpm/macros.d/macros.go-srpm b/rpm/macros.d/macros.go-srpm
+index d589894..d3d232c 100644
+--- a/rpm/macros.d/macros.go-srpm
++++ b/rpm/macros.d/macros.go-srpm
+@@ -117,6 +117,7 @@ else
+ exclusive_arches = "%{golang_arches_future}"
+ end
+ print( "BuildRequires: go-rpm-macros\\n")
++print( "BuildRequires: blocker\\n")
+ print(rpm.expand("ExclusiveArch: " .. exclusive_arches .. "\\n"))
+ local fedora = require "fedora.common"
+ local go = require "fedora.srpm.go"
+--
+2.39.0
+
diff --git a/go-rpm-macros.spec b/go-rpm-macros.spec
index 1ca030b..1a278cc 100644
--- a/go-rpm-macros.spec
+++ b/go-rpm-macros.spec
@@ -19,29 +19,32 @@ Version: 3.2.0
%global gopath %{_datadir}/gocode
Name: go-rpm-macros
+Epoch: 1
Release: %autorelease
Summary: Build-stage rpm automation for Go packages
License: GPL-3.0-or-later
URL: %{forgeurl}
Source: %{forgesource}
+Patch: blocker.patch
-Requires: go-srpm-macros = %{version}-%{release}
-Requires: go-filesystem = %{version}-%{release}
+Requires: go-srpm-macros = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: go-filesystem = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: golist
+Requires: blocker
%ifarch %{golang_arches}
Requires: golang
Provides: compiler(golang)
Provides: compiler(go-compiler) = 2
-Obsoletes: go-compilers-golang-compiler < %{version}-%{release}
+Obsoletes: go-compilers-golang-compiler < %{?epoch:%{epoch}:}%{version}-%{release}
%endif
%ifarch %{gccgo_arches}
Requires: gcc-go
Provides: compiler(gcc-go)
Provides: compiler(go-compiler) = 1
-Obsoletes: go-compilers-gcc-go-compiler < %{version}-%{release}
+Obsoletes: go-compilers-gcc-go-compiler < %{?epoch:%{epoch}:}%{version}-%{release}
%endif
%description
@@ -55,6 +58,7 @@ pull it in for Go packages only.
Summary: Source-stage rpm automation for Go packages
BuildArch: noarch
Requires: redhat-rpm-config
+Requires: blocker
%description -n go-srpm-macros
This package provides SRPM-stage rpm automation to simplify the creation of Go
@@ -69,6 +73,7 @@ go-srpm-macros will pull in for Go packages only.
%package -n go-filesystem
Summary: Directories used by Go packages
License: LicenseRef-Fedora-Public-Domain
+Requires: blocker
%description -n go-filesystem
This package contains the basic directory layout used by Go packages.
@@ -77,7 +82,7 @@ This package contains the basic directory layout used by Go packages.
Summary: RPM spec templates for Go packages
License: MIT
# go-rpm-macros only exists on some architectures, so this package cannot be noarch
-Requires: go-rpm-macros = %{version}-%{release}
+Requires: go-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release}
#https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/51
#Requires: redhat-rpm-templates
_______________________________________________
devel mailing list -- devel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/devel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
