Update to 1.5.0, fix review items

This commit is contained in:
Neil Hanlon 2023-10-26 23:02:47 -04:00 committed by Neil Hanlon
parent c52f830b3a
commit 4fa91488af
Signed by: neil
GPG Key ID: 705BC21EC3C70F34
2 changed files with 26 additions and 6 deletions

View File

@ -1,4 +1,4 @@
%global gittagversion 1.4.0
%global gittagversion 1.5.0
%global gittag v%{?gittagversion}
Name: pinnwand
@ -26,7 +26,16 @@ little more complex
%prep
%autosetup -p 1 -n pinnwand-%{version}
sed -i 's/docutils = "^0.19/docutils = ">=0.19/' pyproject.toml
# NOTE(neil): 2023-10-26 pinnwand 1.4.0 wants 0.19, but Fedora has 20.X
# at the same time, 1.5.0 wants sqlalchemy >= 2, but Fedora has not upgraded to
# it yet. See:
# https://src.fedoraproject.org/rpms/python-sqlalchemy/pull-request/16
sed -i 's/sqlalchemy>=2/sqlalchemy<2/' pyproject.toml
# Upstream switched to `pdm` from poetry for 1.5.0, but this prevents creation
# of the pinnwand entrypoint during build
sed -i 's/tool\.poetry\.scripts/project.scripts/' pyproject.toml
%generate_buildrequires
%pyproject_buildrequires
@ -38,23 +47,33 @@ sed -i 's/docutils = "^0.19/docutils = ">=0.19/' pyproject.toml
%pyproject_install
%pyproject_save_files pinnwand
install -Dpm 0644 %{_sourcedir}/pinnwand.service %{buildroot}%{_unitdir}/%{name}.service
install -Dpm 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
install -Dpm 0644 etc/pinnwand.toml-example %{buildroot}%{_sysconfdir}/%{name}/%{name}.toml
%check
%pytest
%post
%systemd_post %{name}.service
%preun
%systemd_preun %{name}.service
%postun
%systemd_postun_with_restart %{name}.service
%files -f %{pyproject_files}
%dir %{_sysconfdir}/%{name}
%doc README.md
%license LICENSE
%{_bindir}/%{name}
%{_unitdir}/pinnwand.service
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.toml
%changelog
* Thu Oct 26 2023 Neil Hanlon <neil@shrug.pw> - 1.5.0-1
- Update to 1.4.0
* Thu Aug 03 2023 Neil Hanlon <neil@shrug.pw> - 1.4.0-1
- Update to 1.4.0

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (pinnwand-1.4.0.tar.gz) = 4cf3c22679bafa7256e5caa2304922312a0e35aadb909611c49eafa46d053202dc903a886620c16f28449a4a29bc745ceb35e5cf787d7281bc966a818dd31b2e