diff --git a/.gitignore b/.gitignore index 4295503..8503141 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /snapm-0.4.0.tar.gz /snapm-0.4.3.tar.gz +/snapm-0.5.1.tar.gz diff --git a/snapm.spec b/snapm.spec index ed0d782..335baea 100644 --- a/snapm.spec +++ b/snapm.spec @@ -1,8 +1,8 @@ %global summary A set of tools for managing snapshots Name: snapm -Version: 0.4.3 -Release: 1%{?dist} +Version: 0.5.1 +Release: %autorelease Summary: %{summary} License: Apache-2.0 @@ -16,8 +16,12 @@ BuildRequires: lvm2 BuildRequires: make BuildRequires: stratis-cli BuildRequires: stratisd +BuildRequires: systemd-rpm-macros BuildRequires: python3-devel BuildRequires: python3-sphinx +%if 0%{?fedora} +BuildRequires: libfaketime +%endif Requires: python3-snapm = %{version}-%{release} Recommends: boom-boot @@ -65,8 +69,32 @@ rm -f doc/*.rst doc/Makefile doc/conf.py %install %pyproject_install -mkdir -p %{buildroot}/%{_mandir}/man8 -%{__install} -p -m 644 man/man8/snapm.8 %{buildroot}/%{_mandir}/man8 +mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/%{name}/plugins.d +mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/%{name}/schedule.d +%{__install} -p -m 644 etc/%{name}/snapm.conf ${RPM_BUILD_ROOT}/%{_sysconfdir}/%{name} +%{__install} -p -m 644 etc/%{name}/plugins.d/lvm2-cow.conf ${RPM_BUILD_ROOT}/%{_sysconfdir}/%{name}/plugins.d +%{__install} -p -m 644 etc/%{name}/plugins.d/lvm2-thin.conf ${RPM_BUILD_ROOT}/%{_sysconfdir}/%{name}/plugins.d +%{__install} -p -m 644 etc/%{name}/plugins.d/stratis.conf ${RPM_BUILD_ROOT}/%{_sysconfdir}/%{name}/plugins.d + +mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man8 +mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man5 +%{__install} -p -m 644 man/man8/snapm.8 ${RPM_BUILD_ROOT}/%{_mandir}/man8 +%{__install} -p -m 644 man/man5/snapm.conf.5 ${RPM_BUILD_ROOT}/%{_mandir}/man5 +%{__install} -p -m 644 man/man5/snapm-plugins.d.5 ${RPM_BUILD_ROOT}/%{_mandir}/man5 +%{__install} -p -m 644 man/man5/snapm-schedule.d.5 ${RPM_BUILD_ROOT}/%{_mandir}/man5 + +mkdir -p ${RPM_BUILD_ROOT}/%{_unitdir} +%{__install} -p -m 644 systemd/snapm-create@.service ${RPM_BUILD_ROOT}/%{_unitdir} +%{__install} -p -m 644 systemd/snapm-create@.timer ${RPM_BUILD_ROOT}/%{_unitdir} +%{__install} -p -m 644 systemd/snapm-gc@.service ${RPM_BUILD_ROOT}/%{_unitdir} +%{__install} -p -m 644 systemd/snapm-gc@.timer ${RPM_BUILD_ROOT}/%{_unitdir} + +mkdir -p ${RPM_BUILD_ROOT}/%{_tmpfilesdir} +%{__install} -p -m 644 systemd/tmpfiles.d/%{name}.conf ${RPM_BUILD_ROOT}/%{_tmpfilesdir}/ + +%{__install} -d -m 0700 ${RPM_BUILD_ROOT}/%{_rundir}/%{name} +%{__install} -d -m 0700 ${RPM_BUILD_ROOT}/%{_rundir}/%{name}/mounts +%{__install} -d -m 0700 ${RPM_BUILD_ROOT}/%{_rundir}/%{name}/lock %check %pytest --log-level=debug -v tests/ @@ -76,7 +104,18 @@ mkdir -p %{buildroot}/%{_mandir}/man8 %license LICENSE %doc README.md %{_bindir}/snapm -%doc %{_mandir}/man*/snapm.* +%doc %{_mandir}/man*/snapm* +%attr(644, -, -) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/snapm.conf +%attr(644, -, -) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins.d/* +%dir %attr(755, -, -) %{_sysconfdir}/%{name}/schedule.d +%attr(644, -, -) %{_unitdir}/snapm-create@.service +%attr(644, -, -) %{_unitdir}/snapm-create@.timer +%attr(644, -, -) %{_unitdir}/snapm-gc@.service +%attr(644, -, -) %{_unitdir}/snapm-gc@.timer +%attr(644, -, -) %{_tmpfilesdir}/%{name}.conf +%dir %{_rundir}/%{name}/ +%dir %{_rundir}/%{name}/mounts +%dir %{_rundir}/%{name}/lock %files -n python3-snapm # license for snapm (Apache-2.0) @@ -92,15 +131,4 @@ mkdir -p %{buildroot}/%{_mandir}/man8 %doc doc %changelog -* Mon May 12 2025 Bryn M. Reeves - 0.4.3-1 -- Update to upstream 0.4.3 - Resolves: RHEL-89836 - Resolves: RHEL-78813 - -* Thu Jan 09 2025 Bryn M. Reeves - 0.4.0-2 -- Bump release and rebuild - Resolves: RHEL-59005 - -* Wed Dec 18 2024 Bryn M. Reeves - 0.4.0-1 -- Initial commit on c9s - Resolves: RHEL-59005 +%autochangelog diff --git a/sources b/sources index eebae8a..960fde9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (snapm-0.4.3.tar.gz) = 2a481781f1275fbbb6a5052fbc69379aa85b79f05b860e15aef7826ce75627cbfa6717a93c5a9b538f30ba01900fd70e856b8d5d7a417f010af6b4ec58fb377c +SHA512 (snapm-0.5.1.tar.gz) = 30bec3d65c24732ad88ddc04ead12b2fafc96ca2e740283bae02b1214bd77f4d108cf1c597aaf27a487eec334243afac83b6ff8202adfe5224694302f40d7a99