Skip to content

Commit 108f47b

Browse files
durgajagadeeshdj_palli
andauthored
go-rpm-macros: update to 3.6.0 (#11160)
Co-authored-by: dj_palli <dj_palli@microsoft.com>
1 parent 502b828 commit 108f47b

3 files changed

Lines changed: 12 additions & 19 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"go-rpm-macros-3.0.9.tar.gz": "b0e32647be12fc78e2dbcc209332b2f2421a9c3e3dcab9b807797aac5a6b6e33"
3+
"go-rpm-macros-3.6.0.tar.gz": "890a1f4fc53fd13083ec95c94b05f8d8e299b27bcb9085e3e9b4b0446c87ef0c"
44
}
55
}

SPECS-EXTENDED/go-rpm-macros/go-rpm-macros.spec

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
Vendor: Microsoft Corporation
55
Distribution: Azure Linux
66
%global forgeurl https://pagure.io/go-rpm-macros
7-
Version: 3.0.9
7+
Version: 3.6.0
88
%forgemeta
99

10-
#https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/51
1110
%global _spectemplatedir %{_datadir}/rpmdevtools/azl
1211
%global _docdir_fmt %{name}
1312

@@ -22,14 +21,13 @@ Version: 3.0.9
2221
ExclusiveArch: %{golang_arches} %{gccgo_arches}
2322

2423
Name: go-rpm-macros
25-
Release: 3%{?dist}
24+
Release: 1%{?dist}
2625
Summary: Build-stage rpm automation for Go packages
2726

2827
License: GPLv3+
2928
URL: %{forgeurl}
30-
# Source: https://pagure.io/go-rpm-macros/archive/3.0.9/go-rpm-macros-3.0.9.tar.gz
31-
Source: %{forgesource}
32-
Patch0: fixing_ldflags_for_azl.patch
29+
Source0: https://pagure.io/go-rpm-macros/archive/3.6.0/%{name}-%{version}.tar.gz
30+
Source1: %{forgesource}
3331

3432
Requires: go-srpm-macros = %{version}-%{release}
3533
Requires: go-filesystem = %{version}-%{release}
@@ -82,17 +80,13 @@ Summary: RPM spec templates for Go packages
8280
License: MIT
8381
BuildArch: noarch
8482
Requires: go-rpm-macros = %{version}-%{release}
85-
#https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/51
86-
#Requires: redhat-rpm-templates
8783

8884
%description -n go-rpm-templates
8985
This package contains documented rpm spec templates showcasing how to use the
9086
macros provided by go-rpm-macros to create Go packages.
9187

9288
%prep
93-
%forgesetup
94-
%patch 0 -p1
95-
89+
%forgeautosetup -p1
9690
%writevars -f rpm/macros.d/macros.go-srpm golang_arches gccgo_arches gopath
9791
for template in templates/rpm/*\.spec ; do
9892
target=$(echo "${template}" | sed "s|^\(.*\)\.spec$|\1-bare.spec|g")
@@ -101,10 +95,6 @@ for template in templates/rpm/*\.spec ; do
10195
done
10296

10397
%install
104-
# Some of those probably do not work with gcc-go right now
105-
# This is not intentional, but mips is not a primary Fedora architecture
106-
# Patches and PRs are welcome
107-
10898
install -m 0755 -vd %{buildroot}%{gopath}/src
10999

110100
install -m 0755 -vd %{buildroot}%{_spectemplatedir}
@@ -164,12 +154,15 @@ install -m 0644 -vp rpm/macros.d/macros.go-compilers-gcc \
164154
%files -n go-rpm-templates
165155
%license LICENSE-templates.txt
166156
%doc README.md
167-
# https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/51
168157
%dir %{dirname:%{_spectemplatedir}}
169158
%dir %{_spectemplatedir}
170159
%{_spectemplatedir}/*.spec
171160

172161
%changelog
162+
* Wed Nov 20 2024 Durga Jagadeesh Palli <v-dpalli@microsoft.com> - 3.6.0-1
163+
- Update to 3.6.0.
164+
- License verified
165+
173166
* Tue Mar 01 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.0.9-3
174167
- Fixing Go's linker flags.
175168
- License verified.

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4610,8 +4610,8 @@
46104610
"type": "other",
46114611
"other": {
46124612
"name": "go-rpm-macros",
4613-
"version": "3.0.9",
4614-
"downloadUrl": "https://pagure.io/go-rpm-macros/archive/3.0.9/go-rpm-macros-3.0.9.tar.gz"
4613+
"version": "3.6.0",
4614+
"downloadUrl": "https://pagure.io/go-rpm-macros/archive/3.6.0/go-rpm-macros-3.6.0.tar.gz"
46154615
}
46164616
}
46174617
},

0 commit comments

Comments
 (0)