1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
|
From fd1d35efa1f7336197afcfa9bd7c5fb06711a24d Mon Sep 17 00:00:00 2001
From: Maxwell G <maxwell@gtmx.me>
Date: Fri, 8 Sep 2023 22:58:29 +0000
Subject: [PATCH 1/5] Remove unnecessary pyproject macro overrides
---
receptor.spec | 52 ---------------------------------------------------
1 file changed, 52 deletions(-)
diff --git a/receptor.spec b/receptor.spec
index 4cbe6d7..83e856b 100644
--- a/receptor.spec
+++ b/receptor.spec
@@ -3,54 +3,6 @@
%bcond bundled 1
%bcond golang_library %{without bundled}
-%define pyproject_install() %{expand:\\\
-specifier=$(ls %{_pyproject_wheeldir}/*.whl | xargs basename --multiple | sed -E 's/([^-]+)-([^-]+)-.+\\\.whl/\\\1==\\\2/')
-TMPDIR="%{_pyproject_builddir}" %{__python3} -m pip install --root %{buildroot} --prefix %{_prefix} --no-deps --disable-pip-version-check --progress-bar off --verbose --ignore-installed --no-warn-script-location --no-index --no-cache-dir --find-links %{_pyproject_wheeldir} $specifier
-if [ -d %{buildroot}%{_bindir} ]; then
- %py3_shebang_fix %{buildroot}%{_bindir}/*
- rm -rfv %{buildroot}%{_bindir}/__pycache__
-fi
-rm -f %{_pyproject_ghost_distinfo}
-site_dirs=()
-# Process %%{python3_sitelib} if exists
-if [ -d %{buildroot}%{python3_sitelib} ]; then
- site_dirs+=( "%{python3_sitelib}" )
-fi
-# Process %%{python3_sitearch} if exists and does not equal to %%{python3_sitelib}
-if [ %{buildroot}%{python3_sitearch} != %{buildroot}%{python3_sitelib} ] && [ -d %{buildroot}%{python3_sitearch} ]; then
- site_dirs+=( "%{python3_sitearch}" )
-fi
-# Process all *.dist-info dirs in sitelib/sitearch
-for site_dir in ${site_dirs[@]}; do
- for distinfo in %{buildroot}$site_dir/*.dist-info; do
- project_name=$(basename "$distinfo" | cut -d'-' -f1)
- %global _pyproject_record %{_builddir}/%{_pyproject_files_prefix}-${project_name}-pyproject-record
- sed -i 's/pip/rpm/' ${distinfo}/INSTALLER
- PYTHONPATH=%{_rpmconfigdir}/redhat \\
- %{__python3} -B %{_rpmconfigdir}/redhat/pyproject_preprocess_record.py \\
- --buildroot %{buildroot} --record ${distinfo}/RECORD --output %{_pyproject_record}
- rm -fv ${distinfo}/RECORD
- rm -fv ${distinfo}/REQUESTED
- done
-done
-}
-
-%define pyproject_save_files() %{expand:\\\
-%global _pyproject_record %{_builddir}/%{_pyproject_files_prefix}-%{*}-pyproject-record
-%global pyproject_files %{_builddir}/%{_pyproject_files_prefix}-%{*}-pyproject-files
-%{expr:0%{?fedora} >= 39 || 0%{?rhel} >= 10 ? "RPM_PERCENTAGES_COUNT=2" : "RPM_PERCENTAGES_COUNT=8" } \\
-%{__python3} %{_rpmconfigdir}/redhat/pyproject_save_files.py \\
- --output-files "%{pyproject_files}" \\
- --output-modules "%{_pyproject_modules}" \\
- --buildroot "%{buildroot}" \\
- --sitelib "%{python3_sitelib}" \\
- --sitearch "%{python3_sitearch}" \\
- --python-version "%{python3_version}" \\
- --pyproject-record "%{_pyproject_record}" \\
- --prefix "%{_prefix}" \\
- %{*}
-}
-
# https://github.com/ansible/receptor
%global goipath github.com/ansible/receptor
Version: 1.4.1
@@ -318,10 +270,6 @@ install -m 0644 -vp %{SOURCE6} %{buildroot}%{_sysconfdir}/receptor/rece
install -m 0755 -vd %{buildroot}%{_datadir}/selinux/packages
install -m 0600 -vp %{SOURCE7} %{buildroot}%{_datadir}/selinux/packages/receptor.pp
%pyproject_install
-%pyproject_save_files receptorctl
-%pyproject_save_files receptor_python_worker
-%global receptorctl_pyproject_files %{_builddir}/%{_pyproject_files_prefix}-receptorctl-pyproject-files
-%global receptor_python_worker_pyproject_files %{_builddir}/%{_pyproject_files_prefix}-receptor_python_worker-pyproject-files
%post
semodule -n -i %{_datadir}/selinux/packages/receptor.pp
--
2.41.0
From 08686a9dd7e2604a74ecfe4b8c00a14de577cc4e Mon Sep 17 00:00:00 2001
From: Maxwell G <maxwell@gtmx.me>
Date: Fri, 8 Sep 2023 23:00:14 +0000
Subject: [PATCH 2/5] Remove unnecessary manual bundled(...) Provides
---
receptor.spec | 73 ---------------------------------------------------
1 file changed, 73 deletions(-)
diff --git a/receptor.spec b/receptor.spec
index 83e856b..23342c6 100644
--- a/receptor.spec
+++ b/receptor.spec
@@ -113,79 +113,6 @@ Source7: receptor.pp
# https://github.com/ansible/receptor/pull/816
Patch: 0001-Bump-quic-go-to-0.37.4.patch
-%if %{with bundled}
-Provides: bundled(golang(github.com/ansible/receptor) = 1.4.1
-Provides: bundled(golang(github.com/creack/pty) = 1.1.18
-Provides: bundled(golang(github.com/davecgh/go-spew) = 1.1.1
-Provides: bundled(golang(github.com/emicklei/go-restful/v3) = 3.10.2
-Provides: bundled(golang(github.com/fortytw2/leaktest) = 1.3.0
-Provides: bundled(golang(github.com/fsnotify/fsnotify) = 1.6.0
-Provides: bundled(golang(github.com/ghjm/cmdline) = 0.1.2
-Provides: bundled(golang(github.com/go-logr/logr) = 1.2.4
-Provides: bundled(golang(github.com/go-openapi/jsonpointer) = 0.19.6
-Provides: bundled(golang(github.com/go-openapi/jsonreference) = 0.20.2
-Provides: bundled(golang(github.com/go-openapi/swag) = 0.22.3
-Provides: bundled(golang(github.com/go-task/slim-sprig) = 0.0.0-20230315git52ccab3
-Provides: bundled(golang(github.com/gogo/protobuf) = 1.3.2
-Provides: bundled(golang(github.com/golang-jwt/jwt/v4) = 4.5.0
-Provides: bundled(golang(github.com/golang/mock) = 1.6.0
-Provides: bundled(golang(github.com/golang/protobuf) = 1.5.3
-Provides: bundled(golang(github.com/google/gnostic) = 0.6.9
-Provides: bundled(golang(github.com/google/go-cmp) = 0.5.9
-Provides: bundled(golang(github.com/google/gofuzz) = 1.2.0
-Provides: bundled(golang(github.com/google/pprof) = 0.0.0-20230502git255e3b9
-Provides: bundled(golang(github.com/google/shlex) = 0.0.0-20191202gite7afc7f
-Provides: bundled(golang(github.com/google/uuid) = 1.3.0
-Provides: bundled(golang(github.com/gorilla/websocket) = 1.5.0
-Provides: bundled(golang(github.com/imdario/mergo) = 0.3.15
-Provides: bundled(golang(github.com/josharian/intern) = 1.0.0
-Provides: bundled(golang(github.com/json-iterator/go) = 1.1.12
-Provides: bundled(golang(github.com/jupp0r/go-priority-queue) = 0.0.0-20160601gitab10738
-Provides: bundled(golang(github.com/mailru/easyjson) = 0.7.7
-Provides: bundled(golang(github.com/minio/highwayhash) = 1.0.2
-Provides: bundled(golang(github.com/moby/spdystream) = 0.2.0
-Provides: bundled(golang(github.com/modern-go/concurrent) = 0.0.0-20180306gitbacd9c7
-Provides: bundled(golang(github.com/modern-go/reflect2) = 1.0.2
-Provides: bundled(golang(github.com/munnerz/goautoneg) = 0.0.0-20191010gita7dc8b6
-Provides: bundled(golang(github.com/onsi/ginkgo/v2) = 2.9.4
-Provides: bundled(golang(github.com/pbnjay/memory) = 0.0.0-20210728git7b4eea6
-Provides: bundled(golang(github.com/pmezard/go-difflib) = 1.0.0
-Provides: bundled(golang(github.com/prep/socketpair) = 0.0.0-20171228gitc2c6a7f
-Provides: bundled(golang(github.com/quic-go/qtls-go1-19) = 0.3.2
-Provides: bundled(golang(github.com/quic-go/qtls-go1-20) = 0.2.2
-Provides: bundled(golang(github.com/quic-go/quic-go) = 0.34.0
-Provides: bundled(golang(github.com/rogpeppe/go-internal) = 1.10.0
-Provides: bundled(golang(github.com/songgao/water) = 0.0.0-20200317git2b4b6d7
-Provides: bundled(golang(github.com/spf13/pflag) = 1.0.5
-Provides: bundled(golang(github.com/stretchr/testify) = 1.8.1
-Provides: bundled(golang(github.com/vishvananda/netlink) = 1.1.0
-Provides: bundled(golang(github.com/vishvananda/netns) = 0.0.4
-Provides: bundled(golang(golang.org/x/crypto) = 0.8.0
-Provides: bundled(golang(golang.org/x/exp) = 0.0.0-20230425git47ecfdc
-Provides: bundled(golang(golang.org/x/mod) = 0.10.0
-Provides: bundled(golang(golang.org/x/net) = 0.9.0
-Provides: bundled(golang(golang.org/x/oauth2) = 0.7.0
-Provides: bundled(golang(golang.org/x/sys) = 0.8.0
-Provides: bundled(golang(golang.org/x/term) = 0.8.0
-Provides: bundled(golang(golang.org/x/text) = 0.9.0
-Provides: bundled(golang(golang.org/x/time) = 0.3.0
-Provides: bundled(golang(golang.org/x/tools) = 0.8.0
-Provides: bundled(golang(google.golang.org/appengine) = 1.6.7
-Provides: bundled(golang(google.golang.org/protobuf) = 1.30.0
-Provides: bundled(golang(gopkg.in/inf.v0) = 0.9.1
-Provides: bundled(golang(gopkg.in/yaml.v2) = 2.4.0
-Provides: bundled(golang(gopkg.in/yaml.v3) = 3.0.1
-Provides: bundled(golang(k8s.io/api) = 0.27.1
-Provides: bundled(golang(k8s.io/apimachinery) = 0.27.1
-Provides: bundled(golang(k8s.io/client-go) = 0.27.1
-Provides: bundled(golang(k8s.io/klog/v2) = 2.100.1
-Provides: bundled(golang(k8s.io/kube-openapi) = 0.0.0-20230501git8b0f38b
-Provides: bundled(golang(k8s.io/utils) = 0.0.0-20230505git9f67429
-Provides: bundled(golang(sigs.k8s.io/json) = 0.0.0-20221116gitbc3834c
-Provides: bundled(golang(sigs.k8s.io/structured-merge-diff/v4) = 4.2.3
-Provides: bundled(golang(sigs.k8s.io/yaml) = 1.3.0
-%endif
-
BuildRequires: python3-devel
# For Python tests
BuildRequires: psmisc
--
2.41.0
From c3db4f5e40cc435ce02b43942e0fc64f0992c82e Mon Sep 17 00:00:00 2001
From: Maxwell G <maxwell@gtmx.me>
Date: Fri, 8 Sep 2023 23:35:01 +0000
Subject: [PATCH 3/5] Properly set GO111MODULE=on
---
receptor.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/receptor.spec b/receptor.spec
index 23342c6..4c9a5b1 100644
--- a/receptor.spec
+++ b/receptor.spec
@@ -170,8 +170,8 @@ cd ../receptor-python-worker
%build
%if %{with bundled}
-%global export GO111MODULE=on
-#export GOFLAGS=-mod=vendor
+%global gomodulesmode GO111MODULE=on
+export GOFLAGS=-mod=vendor
%endif
export LDFLAGS="-X 'github.com/ansible/receptor/internal/version.Version=%{VERSION}' "
%gobuild -o %{gobuilddir}/bin/receptor %{goipath}/cmd/receptor-cl
--
2.41.0
From 260bc018c7efbe35322c3728075d3135bc420ab4 Mon Sep 17 00:00:00 2001
From: Maxwell G <maxwell@gtmx.me>
Date: Fri, 8 Sep 2023 23:22:39 +0000
Subject: [PATCH 4/5] Fix inverted golang_library conditionals
---
receptor.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/receptor.spec b/receptor.spec
index 4c9a5b1..6139397 100644
--- a/receptor.spec
+++ b/receptor.spec
@@ -141,7 +141,7 @@ Summary: Python plugin called by Receptor
The receptor-python-worker command is called by Receptor to supervise the
operation of a Python worker plugin."
-%if %{without golang_library}
+%if %{with golang_library}
%gopkg
%endif
@@ -183,7 +183,7 @@ pushd receptor-python-worker
popd
%install
-%if %{without golang_library}
+%if %{with golang_library}
%gopkginstall
%endif
install -m 0755 -vd %{buildroot}%{_bindir}
@@ -247,7 +247,7 @@ popd
%{python3_sitelib}/receptor_python_worker/
%{python3_sitelib}/receptor_python_worker-%{version}.dist-info/
-%if %{without golang_library}
+%if %{with golang_library}
%gopkgfiles
%endif
--
2.41.0
From f4c17033e3217fd90901539517c78d017911b9c8 Mon Sep 17 00:00:00 2001
From: Maxwell G <maxwell@gtmx.me>
Date: Fri, 8 Sep 2023 23:05:00 +0000
Subject: [PATCH 5/5] Simplify archive unpacking
We can use a single %autosetup invocation, and there's no need to rename
README files.
---
receptor.spec | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/receptor.spec b/receptor.spec
index 6139397..7cc1bab 100644
--- a/receptor.spec
+++ b/receptor.spec
@@ -146,18 +146,12 @@ operation of a Python worker plugin."
%endif
%prep
-%if %{with bundled}
-%goprep -k
-# unpack vendored dependencies
-%setup -q -T -D -a 1 -n %{name}-%{version}
-%else
-%goprep
-%endif
-%autopatch -p1
+%autosetup -p1 %{forgesetupargs} %{?with_bundled:-a1}
+%goprep -e %{?with_bundled:-k}
+
+# Set versions
echo "%{version}" > receptor-python-worker/.VERSION
echo "%{version}" > receptorctl/.VERSION
-mv receptor-python-worker/README.md README-receptor-python-worker.md
-mv receptorctl/README.md README-receptorctl.md
%generate_buildrequires
%if %{without bundled}
@@ -236,13 +230,13 @@ popd
%{_unitdir}/receptor@.service
%files -n receptorctl
-%doc README-receptorctl.md
+%doc receptorctl/README.md
%{_bindir}/receptorctl
%{python3_sitelib}/receptorctl/
%{python3_sitelib}/receptorctl-%{version}.dist-info/
%files -n python3-receptor-python-worker
-%doc README-receptor-python-worker.md
+%doc receptor-python-worker/README.md
%{_bindir}/receptor-python-worker
%{python3_sitelib}/receptor_python_worker/
%{python3_sitelib}/receptor_python_worker-%{version}.dist-info/
--
2.41.0
|
