diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index cdf3250..cdf2a5d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -18,11 +18,8 @@ jobs: fail-fast: false matrix: include: - - name: centos-stream-8 - shortcut: cs8 - container-name: el8stream - name: centos-stream-9 - shortcut: cs9 + shortcut: c9s container-name: el9stream name: ${{ matrix.name }} @@ -37,7 +34,7 @@ jobs: - name: Prepare build environment run: | # Install oVirt repositories - dnf copr enable -y ovirt/ovirt-master-snapshot centos-stream-8 + dnf copr enable -y ovirt/ovirt-master-snapshot centos-stream-9 dnf install -y ovirt-release-master - name: Install required packages @@ -82,8 +79,8 @@ jobs: directory: ${{ env.ARTIFACTS_DIR }} - name: Checkout target repository - if: ${{ matrix.shortcut == 'cs9' }} - uses: actions/checkout@v2 + if: ${{ matrix.shortcut == 'c9s' }} + uses: actions/checkout@v4 with: path: ovirt-engine-sdk ref: 'gh-pages' @@ -110,7 +107,7 @@ jobs: libgnutls28-dev - name: Checkout sources - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install pip2.7 # This step installs pip2.7, which will be needed later @@ -142,7 +139,7 @@ jobs: run: pdoc ovirtsdk4 --html --html-dir=html - name: Upload generated documentation artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: generated-documentation path: ${{ env.GEN_DOC_DIR }}/* @@ -157,7 +154,7 @@ jobs: image: quay.io/centos/centos:stream9 steps: - name: Download generated documentation artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: generated-documentation path: ${{ env.GEN_DOC_DIR }} @@ -176,7 +173,7 @@ jobs: git config --global user.email '41898282+github-actions[bot]@users.noreply.github.com' - name: Checkout target repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: ovirt-engine-sdk ref: 'gh-pages' diff --git a/python-ovirt-engine-sdk4.spec.in b/python-ovirt-engine-sdk4.spec.in index 790b927..1fc443d 100644 --- a/python-ovirt-engine-sdk4.spec.in +++ b/python-ovirt-engine-sdk4.spec.in @@ -27,7 +27,6 @@ Requires: python3-six This package contains the Python 3 SDK for version 4 of the oVirt Engine API. -%if 0%{?rhel} >= 9 %package -n python3.11-ovirt-engine-sdk4 Summary: oVirt Engine Software Development Kit (Python) BuildRequires: python3.11-devel @@ -40,22 +39,19 @@ Requires: python3.11-six %description -n python3.11-ovirt-engine-sdk4 This package contains the Python 3.11 SDK for version 4 of the oVirt Engine API. -%endif -%if 0%{?rhel} < 9 -%package -n python3.11-ovirt-engine-sdk4 +%package -n python3.12-ovirt-engine-sdk4 Summary: oVirt Engine Software Development Kit (Python) -BuildRequires: python3.11-devel -BuildRequires: python3.11-setuptools +BuildRequires: python3.12-devel +BuildRequires: python3.12-setuptools Requires: libxml2 -Requires: python3.11 -Requires: python3.11-pycurl >= 7.43.0-6 -Requires: python3.11-six +Requires: python3.12 +Requires: python3.12-pycurl >= 7.43.0-6 +Requires: python3.12-six -%description -n python3.11-ovirt-engine-sdk4 -This package contains the Python 3.11 SDK for version 4 of the oVirt Engine +%description -n python3.12-ovirt-engine-sdk4 +This package contains the Python 3.12 SDK for version 4 of the oVirt Engine API. -%endif %prep %setup -c -q -n ovirt-engine-sdk-python-@PACKAGE_VERSION@ @@ -64,31 +60,23 @@ API. %define python3_pkgversion 3 %define __python3 /usr/bin/python3 %py3_build -%if 0%{?rhel} < 9 %define python3_pkgversion 3.11 %define __python3 /usr/bin/python3.11 %py3_build -%endif -%if 0%{?rhel} >= 9 -%define python3_pkgversion 3.11 -%define __python3 /usr/bin/python3.11 +%define python3_pkgversion 3.12 +%define __python3 /usr/bin/python3.12 %py3_build -%endif %install %define python3_pkgversion 3 %define __python3 /usr/bin/python3 %py3_install -%if 0%{?rhel} < 9 %define python3_pkgversion 3.11 %define __python3 /usr/bin/python3.11 %py3_install -%endif -%if 0%{?rhel} >= 9 -%define python3_pkgversion 3.11 -%define __python3 /usr/bin/python3.11 +%define python3_pkgversion 3.12 +%define __python3 /usr/bin/python3.12 %py3_install -%endif %files -n python3-ovirt-engine-sdk4 %doc README.adoc @@ -98,7 +86,6 @@ API. %define __python3 /usr/bin/python3 %{python3_sitearch}/* -%if 0%{?rhel} < 9 %files -n python3.11-ovirt-engine-sdk4 %doc README.adoc %doc examples @@ -106,17 +93,14 @@ API. %define python3_pkgversion 3.11 %define __python3 /usr/bin/python3.11 %{python3_sitearch}/* -%endif -%if 0%{?rhel} >= 9 -%files -n python3.11-ovirt-engine-sdk4 +%files -n python3.12-ovirt-engine-sdk4 %doc README.adoc %doc examples %license LICENSE.txt -%define python3_pkgversion 3.11 -%define __python3 /usr/bin/python3.11 +%define python3_pkgversion 3.12 +%define __python3 /usr/bin/python3.12 %{python3_sitearch}/* -%endif %changelog * Thu Mar 23 2023 Martin Necas - 4.6.2-1