diff --git a/Makefile b/Makefile index bc43e3a..89695e1 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ prerequisites: @/bin/bash -Eeuo pipefail -c 'if ! rpmbuild --version &>/dev/null; then dnf install -y rpm-build; fi' @/bin/bash -Eeuo pipefail -c 'if ! copr-cli --version &>/dev/null; then dnf install -y copr-cli; fi' @/bin/bash -Eeuo pipefail -c 'if ! git --version &>/dev/null; then dnf install -y git; fi' - @/bin/bash -Eeuo pipefail -c 'if ! zfs-autobackup --version &>/dev/null; then pip install --upgrade zfs-autobackup; fi' + @/bin/bash -Eeuo pipefail -c 'if [ -z "$$(which zfs-autobackup)" ]; then pip install --upgrade zfs-autobackup; fi' install: @echo "Installing zvirt..." @@ -46,6 +46,9 @@ srpm: prerequisites @git ls-files | sed 's|^|./|' > build/filelist.txt @mkdir -p build/zvirt-$(VERSION)/SOURCES @tar --verbatim-files-from --files-from=build/filelist.txt -cvzf build/zvirt-$(VERSION)/SOURCES/zvirt-$(VERSION).tar.gz --transform "s|^./|zvirt-$(VERSION)/|" + @pip download --no-deps zfs-autobackup -d build/zvirt-$(VERSION)/SOURCES/ --quiet + @ZFS_AB_WHL=$$(ls build/zvirt-$(VERSION)/SOURCES/zfs_autobackup-*.whl | head -1 | xargs basename); \ + sed -i "s|^Source1:.*|Source1: $${ZFS_AB_WHL}|" packaging/zvirt.spec @rpmbuild --define "_topdir $$(pwd)/build/zvirt-$(VERSION)" --define "dist %{nil}" -bs packaging/zvirt.spec rpm: prerequisites srpm diff --git a/packaging/zvirt.spec b/packaging/zvirt.spec index 45cfa1a..7d9d073 100644 --- a/packaging/zvirt.spec +++ b/packaging/zvirt.spec @@ -1,3 +1,4 @@ +%global __brp_python_bytecompile %{nil} Name: zvirt Version: 0.0.5 %if %{defined dist} @@ -10,14 +11,18 @@ Summary: Libvirt ZFS snapshots utility License: MIT URL: https://github.com/nmasse-itix/zvirt Source0: %{name}-%{version}.tar.gz +Source1: zfs_autobackup-3.3-py3-none-any.whl BuildArch: noarch Requires: bash Requires: libvirt Requires: zfs +Requires: python3-colorama BuildRequires: make BuildRequires: python3-pip +BuildRequires: python3-rpm-macros +BuildRequires: python3-colorama %description Zvirt takes snapshots of Libvirt domains using ZFS. @@ -37,12 +42,20 @@ It is implemented as a set of hooks for the zfs_autobackup script. %install make PREFIX=%{buildroot}%{_prefix} install -pip install --target %{buildroot}%{python3_sitelib} foo-package +pip install --root %{buildroot} --prefix %{_prefix} --no-compile --no-deps --no-index --ignore-installed --find-links %{_sourcedir} zfs-autobackup %files %{_bindir}/libvirt-hook %{_bindir}/snapshot-libvirt-domains +%{_bindir}/zfs-autobackup +%{_bindir}/zfs-autoverify +%{_bindir}/zfs-check +%{python3_sitelib}/zfs_autobackup/ +%{python3_sitelib}/zfs_autobackup-*.dist-info/ %changelog +* Wed Apr 22 2026 Nicolas Massé - 0.0.6-1 +- Switch to zfs-autobackup + hooks + * Mon Nov 24 2025 Nicolas Massé - 0.0.1-1 - Initial package release