Skip to content

Commit 9971263

Browse files
committed
Adding dependency packages for koji.
1 parent 544f553 commit 9971263

22 files changed

Lines changed: 1837 additions & 4 deletions

LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

LICENSES-AND-NOTICES/SPECS/data/licenses.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1662,6 +1662,7 @@
16621662
"python-blivet",
16631663
"python-boltons",
16641664
"python-breathe",
1665+
"python-build",
16651666
"python-cached_property",
16661667
"python-cbor2",
16671668
"python-charset-normalizer",
@@ -1764,6 +1765,7 @@
17641765
"python-mpmath",
17651766
"python-msal",
17661767
"python-msrestazure",
1768+
"python-multilib",
17671769
"python-mutagen",
17681770
"python-networkx",
17691771
"python-nose2",
@@ -1786,12 +1788,14 @@
17861788
"python-productmd",
17871789
"python-prometheus_client",
17881790
"python-ptyprocess",
1791+
"python-pycdio",
17891792
"python-pycosat",
17901793
"python-pydbus",
17911794
"python-pymongo",
17921795
"python-PyMySQL",
17931796
"python-pyperclip",
17941797
"python-pyproject-api",
1798+
"python-pyproject-hooks",
17951799
"python-pyproject-metadata",
17961800
"python-pyroute2",
17971801
"python-pyrsistent",
@@ -1912,6 +1916,7 @@
19121916
"qhull",
19131917
"qpdf",
19141918
"qperf",
1919+
"qpid-proton",
19151920
"qr-code-generator",
19161921
"qt-rpm-macros",
19171922
"qt6-qtconnectivity",
@@ -2129,6 +2134,7 @@
21292134
"vhostmd",
21302135
"vino",
21312136
"virglrenderer",
2137+
"virt-manager",
21322138
"virt-p2v",
21332139
"virt-top",
21342140
"virt-what",
@@ -2228,6 +2234,7 @@
22282234
"Fedora (ISC)": {
22292235
"license": "[ISC License](https://github.com/sarugaku/resolvelib/blob/main/LICENSE)",
22302236
"specs": [
2237+
"python-requests-gssapi",
22312238
"python-resolvelib"
22322239
]
22332240
},

SPECS-EXTENDED/koji/koji.spec

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,13 @@ BuildRequires: python%{python3_pkgversion}-setuptools
4343
BuildRequires: make
4444
BuildRequires: python3-pip
4545
BuildRequires: python3-wheel
46-
46+
Requires: python%{python3_pkgversion}-rpm
47+
Requires: python%{python3_pkgversion}-requests
48+
Requires: python%{python3_pkgversion}-requests-gssapi
49+
Requires: python%{python3_pkgversion}-dateutil
50+
Requires: python%{python3_pkgversion}-six
51+
Requires: python%{python3_pkgversion}-defusedxml
52+
4753
%description -n python%{python3_pkgversion}-%{name}
4854
Koji is a system for building and tracking RPMS.
4955
This subpackage provides python functions and libraries.
@@ -74,6 +80,8 @@ Summary: Koji XMLRPC interface
7480
License: LGPL-2.1-only
7581
# rpmdiff lib (from rpmlint) is GPLv2 (only)
7682
Requires: httpd
83+
Requires: python%{python3_pkgversion}-mod_wsgi
84+
Requires: mod_auth_gssapi
7785
Requires: python%{python3_pkgversion}-psycopg2
7886
Requires: python%{python3_pkgversion}-%{name} = %{version}-%{release}
7987
Provides: %{name}-hub-code = %{version}-%{release}
@@ -96,6 +104,7 @@ Plugins to the koji XMLRPC interface
96104
Summary: Koji hub plugins
97105
License: LGPL-2.1-only
98106
Requires: python%{python3_pkgversion}-%{name}-hub = %{version}-%{release}
107+
Requires: python%{python3_pkgversion}-qpid-proton
99108
Requires: cpio
100109
Provides: %{name}-hub-plugins-code = %{version}-%{release}
101110

@@ -124,8 +133,10 @@ Requires: /usr/bin/git
124133
Requires: createrepo_c >= 0.10.0
125134
Requires: python%{python3_pkgversion}-%{name} = %{version}-%{release}
126135
Requires: python%{python3_pkgversion}-librepo
136+
Requires: python%{python3_pkgversion}-multilib
127137
Requires: python%{python3_pkgversion}-cheetah
128-
138+
Requires: python%{python3_pkgversion}-pycdio
139+
129140
%description builder
130141
koji-builder is the daemon that runs on build machines and executes
131142
tasks that come through the Koji system.
@@ -139,6 +150,7 @@ Requires(preun): systemd
139150
Requires(postun): systemd
140151
Requires: python%{python3_pkgversion}-libvirt
141152
Requires: python%{python3_pkgversion}-libxml2
153+
Requires: /usr/bin/virt-clone
142154
Requires: qemu-img
143155

144156
%description vm
@@ -175,7 +187,10 @@ Summary: Koji Web UI
175187
License: LGPL-2.1-only
176188
%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}-web}
177189
Requires: httpd
190+
Requires: python%{python3_pkgversion}-mod_wsgi
191+
Requires: mod_auth_gssapi
178192
Requires: python%{python3_pkgversion}-psycopg2
193+
Requires: python%{python3_pkgversion}-cheetah
179194
Requires: python%{python3_pkgversion}-%{name} = %{version}-%{release}
180195
Provides: %{name}-web-code = %{version}-%{release}
181196

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"Signatures": {
3+
"build-1.4.2.tar.gz": "bd2a8d5180cecd84c1ef6eb232da8346b190c656980a13b8add2d9b7086e991f"
4+
}
5+
}
Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
# not all test dependencies are included in RHEL: filelock, pytest-mock
2+
%bcond tests %{undefined rhel}
3+
# uv has many build dependencies which are not included in RHEL;
4+
# virtualenv is not included in RHEL
5+
%bcond extras %{undefined rhel}
6+
7+
%global pypi_name build
8+
9+
Name: python-%{pypi_name}
10+
Version: 1.4.2
11+
Release: 1%{?dist}
12+
Summary: A simple, correct PEP517 package builder
13+
Vendor: Microsoft Corporation
14+
Distribution: Azure Linux
15+
16+
License: MIT
17+
URL: https://github.com/pypa/build
18+
Source0: %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz
19+
20+
# downstream-only
21+
#Patch: 0001-fedora-disable-some-build-requirements.patch
22+
23+
BuildArch: noarch
24+
25+
BuildRequires: python3-devel
26+
BuildRequires: python3-pip
27+
BuildRequires: python3-flit-core
28+
BuildRequires: python3-wheel
29+
BuildRequires: python3-pyproject-hooks
30+
BuildRequires: pyproject-rpm-macros >= 0-41
31+
%if %{with tests}
32+
BuildRequires: python3dist(pytest)
33+
BuildRequires: python3dist(pytest-mock)
34+
BuildRequires: python3dist(filelock)
35+
%endif
36+
37+
%description
38+
A simple, correct PEP517 package builder.
39+
40+
41+
%package -n python3-%{pypi_name}
42+
Summary: %{summary}
43+
44+
%description -n python3-%{pypi_name}
45+
A simple, correct PEP517 package builder.
46+
47+
48+
# Even --without extras, we still build the extras in ELN
49+
# to make it available in ELN Extras (e.g. tox).
50+
# Note that due to technical limitations,
51+
# we must *not* generate their runtime deps as BuildRequires
52+
# or else they are pulled into ELN proper (not ELN Extras).
53+
# https://github.com/fedora-eln/eln/issues/309
54+
%if %{with extras} || %{defined eln}
55+
%pyproject_extras_subpkg -n python3-%{pypi_name} virtualenv uv
56+
%endif
57+
58+
%prep
59+
%autosetup -p1 -n %{pypi_name}-%{version}
60+
61+
# flit-core in this buildroot expects PEP 621 license as a table.
62+
if grep -qE '^license *= *"[^"]+"' pyproject.toml; then
63+
sed -E -i 's/^license *= *"([^"]+)"/license = {text = "\1"}/' pyproject.toml
64+
fi
65+
66+
# Add the 'flaky' marker used in upstream tests but not declared in pyproject.toml.
67+
sed -i '/^markers = \[/a\ "flaky",' pyproject.toml
68+
69+
# When building as root, file-permission checks are bypassed; skip the
70+
# PermissionError branch of test_init to avoid a spurious DID NOT RAISE failure.
71+
sed -i "s/if not sys.platform.startswith('win'):/if not sys.platform.startswith('win') and os.getuid() != 0:/" \
72+
tests/test_projectbuilder.py
73+
74+
%generate_buildrequires
75+
%if %{with tests}
76+
%pyproject_buildrequires -R
77+
%else
78+
%pyproject_buildrequires
79+
%endif
80+
81+
%build
82+
%pyproject_wheel
83+
%install
84+
%pyproject_install
85+
%pyproject_save_files %{pypi_name}
86+
87+
%check
88+
%pyproject_check_import
89+
%if %{with tests}
90+
# Upstream has integration tests that can be run with the --run-integration
91+
# flag, but currently that only includes one network test and one test that is
92+
# xfail when flit-core is installed (which it will be during our package
93+
# build), so including that flag doesn't run any additional tests.
94+
%pytest -v -m "not network"
95+
%endif
96+
97+
%files -n python3-%{pypi_name} -f %{pyproject_files}
98+
%license LICENSE
99+
%doc README.md
100+
%{_bindir}/pyproject-build
101+
102+
%changelog
103+
* Sat Apr 4 2026 Akarsh Chaudhary <v-akarshc@microsoft.com> - 1.4.2-1
104+
- Initial CBL-Mariner import from Fedora 44 (license: MIT).
105+
- License verified
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"Signatures": {
3+
"python-multilib-1.3.tar.bz2": "032e8c7251dabbf3d50101797f71a6944933751f52dc41f3ae93cfc76a46c371"
4+
}
5+
}

0 commit comments

Comments
 (0)