diff --git a/calypso.spec b/calypso.spec index b31039e..69bc2b5 100644 --- a/calypso.spec +++ b/calypso.spec @@ -6,10 +6,9 @@ Name: calypso Version: 2.0 -Release: 0.24.%{date}git%{shortcommit}%{?dist} +Release: 0.1.%{date}git%{shortcommit}%{?dist} Summary: Free and open-source CalDAV calendar server -# Automatically converted from old format: GPLv3+ - review is highly recommended. -License: GPL-3.0-or-later +License: GPLv3+ URL: https://keithp.com/blogs/calypso/ Source0: %{name}-%{commit}.tar.xz Source1: %{name}-mktarball.sh @@ -18,17 +17,21 @@ Source3: %{name}.pam Source4: %{name}.systemd # fix python-daemon dependency name Patch0: %{name}-daemon.patch +BuildRequires: python3-daemon BuildRequires: python3-devel +BuildRequires: python3-iniparse +BuildRequires: python3-vobject BuildRequires: systemd-rpm-macros %if %{with check} BuildRequires: git-core -BuildRequires: python3-iniparse -BuildRequires: python3-pytest +BuildRequires: python3-nose %endif +Requires(pre): shadow-utils Requires(post): git-core Requires: git-core Requires: python3-lockfile Recommends: python3-kerberos +Recommends: python3-PyPAM BuildArch: noarch %description @@ -40,36 +43,31 @@ patches to Radicale but was eventually split off as a separate project. * Uses git to retain a history of the database %prep -%autosetup -p1 -n %{name}-%{commit} - -# Create a sysusers.d config file -cat >calypso.sysusers.conf </dev/null || groupadd -r calypso +getent passwd calypso >/dev/null || \ + useradd -r -g calypso -d %{_sharedstatedir}/calypso -s /sbin/nologin \ + -c "CalDAV/CardDAV server with git storage" calypso +exit 0 %preun %systemd_preun calypso.service @@ -91,7 +89,8 @@ fi %postun %systemd_postun_with_restart calypso.service -%files -f %{pyproject_files} +%files +%license COPYING %doc README collection-config config %dir %attr(0750,root,calypso) %{_sysconfdir}/calypso %config(noreplace) %{_sysconfdir}/calypso/config @@ -99,80 +98,10 @@ fi %{_bindir}/calypso %{_mandir}/man1/calypso.1* %{_unitdir}/calypso.service +%{python3_sitelib}/calypso-%{version}-py%{python3_version}.egg-info +%{python3_sitelib}/calypso %dir %attr(0750,calypso,calypso) %{_sharedstatedir}/calypso -%{_sysusersdir}/calypso.conf %changelog -* Fri Sep 19 2025 Python Maint - 2.0-0.24.20190429git7317d88 -- Rebuilt for Python 3.14.0rc3 bytecode - -* Fri Aug 15 2025 Python Maint - 2.0-0.23.20190429git7317d88 -- Rebuilt for Python 3.14.0rc2 bytecode - -* Wed Jul 23 2025 Fedora Release Engineering - 2.0-0.22.20190429git7317d88 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Jul 21 2025 Dominik Mierzejewski 2.0-0.21.20190429git7317d88 -- switch to modern python packaging macros (resolves rhbz#2377219) -- drop nonexistent Recommends: - -* Tue Jun 03 2025 Python Maint - 2.0-0.20.20190429git7317d88 -- Rebuilt for Python 3.14 - -* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.0-0.19.20190429git7317d88 -- Add sysusers.d config file to allow rpm to create users/groups automatically - -* Thu Jan 16 2025 Fedora Release Engineering - 2.0-0.18.20190429git7317d88 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 25 2024 Miroslav Suchý - 2.0-0.17.20190429git7317d88 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 2.0-0.16.20190429git7317d88 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jun 07 2024 Python Maint - 2.0-0.15.20190429git7317d88 -- Rebuilt for Python 3.13 - -* Tue Jan 23 2024 Fedora Release Engineering - 2.0-0.14.20190429git7317d88 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 2.0-0.13.20190429git7317d88 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 2.0-0.12.20190429git7317d88 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jul 07 2023 Python Maint - 2.0-0.11.20190429git7317d88 -- Rebuilt for Python 3.12 - -* Wed Jan 18 2023 Fedora Release Engineering - 2.0-0.10.20190429git7317d88 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 2.0-0.9.20190429git7317d88 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jun 15 2022 Python Maint - 2.0-0.8.20190429git7317d88 -- Rebuilt for Python 3.11 - -* Thu Feb 17 2022 Charalampos Stratakis - 2.0-0.7.20190429git7317d88 -- Utilize pytest instead of the deprecated nose test runner - -* Wed Jan 19 2022 Fedora Release Engineering - 2.0-0.6.20190429git7317d88 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 2.0-0.5.20190429git7317d88 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 2.0-0.4.20190429git7317d88 -- Rebuilt for Python 3.10 - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.0-0.3.20190429git7317d88 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Tue Jan 26 2021 Fedora Release Engineering - 2.0-0.2.20190429git7317d88 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - * Mon Mar 02 2020 Dominik Mierzejewski 2.0-0.1.20190429git7317d88 - initial build