From f873e5160f260f71dd5c9acafc98f8cfb6186665 Mon Sep 17 00:00:00 2001
From: Peter Bieringer <pb@bieringer.de>
Date: Mar 18 2024 07:26:23 +0000
Subject: Update to 3.1.9


Remove obsolete patches
Add support for intermediate build using gitcommit

---

diff --git a/radicale-config-storage-hooks-SELinux-note.patch b/radicale-config-storage-hooks-SELinux-note.patch
index 6baa180..d9a6f47 100644
--- a/radicale-config-storage-hooks-SELinux-note.patch
+++ b/radicale-config-storage-hooks-SELinux-note.patch
@@ -3,7 +3,7 @@
 @@ -94,6 +94,7 @@
  
  # Command that is run after changes to storage
- # Example: ([ -d .git ] || git init) && git add -A && (git diff --cached --quiet || git commit -m "Changes by "%(user)s)
+ # Example: ([ -d .git ] || git init) && git add -A && (git diff --cached --quiet || git commit -m "Changes by \"%(user)s\"")
 +# Note: storage hooks configuration is currently not supported by packaged SELinux policy and requires a local custom policy extension (RHBZ#1928899)
  #hook =
  
diff --git a/radicale.spec b/radicale.spec
index 8b1c416..1138945 100644
--- a/radicale.spec
+++ b/radicale.spec
@@ -6,22 +6,46 @@
 #
 # Note: this is the simplified spec file for Fedora
 
+### supports following defines during RPM build:
+#
+### specific git commit on upstream (EXAMPLE)
+## build SRPMS
+# fedpkg srpm --define "gitcommit 49d0ad5b18a3867925e2ffd1d8cec21d99e13b3e" -- --undefine=_disable_source_fetch
+#
+## build RPMS local
+# fedpkg local --define "gitcommit 49d0ad5b18a3867925e2ffd1d8cec21d99e13b3e" -- --undefine=_disable_source_fetch
+#
+## rebuild SRPMS on a different system using
+# rpmbuild --rebuild -D "gitcommit 49d0ad5b18a3867925e2ffd1d8cec21d99e13b3e" radicale3-<VERSION>-<RELEASE>.YYYYMMDDgitSHORTHASH.DIST.src.rpm
+
 %define	radicale_major	3
 
-%define	radicale_version	3.1.8
-%define	radicale_release	54
+%define	radicale_version	3.1.9
+%define	radicale_release	1
 
 %define	radicale_name	radicale
 
 %define	radicale_package_name	radicale3
 
+%if 0%{?gitcommit:1}
+%global shortcommit %(c=%{gitcommit}; echo ${c:0:7})
+%define build_timestamp %(date +"%Y%m%d")
+%global gittag .%{build_timestamp}git%{shortcommit}
+%endif
+
 Name:             radicale
 Version:          %{radicale_version}
-Release:          %{radicale_release}%{?dist}.2
+Release:          %{radicale_release}%{?gittag}%{?dist}
 Summary:          A simple CalDAV (calendar) and CardDAV (contact) server
 License:          GPLv3+
 URL:              https://radicale.org
+
+%if 0%{?gitcommit:1}
+Source0:          https://github.com/Kozea/Radicale/archive/%{gitcommit}/%{name}-%{gitcommit}.tar.gz
+%else
 Source0:          https://github.com/Kozea/Radicale/archive/v%{version}/%{name}-%{version}.tar.gz
+%endif
+
 Source1:          %{name}.service
 Source3:          %{name}-httpd
 Source4:          %{name}.te
@@ -33,8 +57,6 @@ Source50:	  %{name}-test-example.ics
 Source51:	  %{name}-test-example.vcf
 
 Patch0:           %{name}-config-storage-hooks-SELinux-note.patch
-Patch1:           %{name}-3.1.8-20230422-d7ce2f0b.patch
-Patch2:           %{name}-3.1.8-fix-main-component-PR-1252.patch
 
 BuildArch:        noarch
 
@@ -150,7 +172,13 @@ Note: storage hooks configuration is currently not supported by packaged
 
 
 %prep
-%autosetup -n Radicale-%{version} -p 1
+%if 0%{?gitcommit:1}
+%define build_version %{gitcommit}
+%else
+%define build_version %{version}
+%endif
+%autosetup -n Radicale-%{build_version} -p 1
+
 mkdir SELinux
 cp -p %{SOURCE4} %{SOURCE5} %{SOURCE6} SELinux
 
@@ -382,6 +410,11 @@ fi
 
 
 %changelog
+* Mon Mar 18 2024 Peter Bieringer <pb@bieringer.de> - 3.1.9-1
+- Update to 3.1.9
+- Remove obsolete patches
+- Add support for intermediate build using gitcommit
+
 * Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.8-54.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/radicale.te b/radicale.te
index 4e53bee..b9c3989 100644
--- a/radicale.te
+++ b/radicale.te
@@ -1,4 +1,4 @@
-policy_module(radicale, 1.0.11)
+policy_module(radicale, 1.0.12)
 
 gen_require(`
     type httpd_t;
@@ -63,6 +63,8 @@ allow radicale_t proc_net_t:file read; # RHBZ#2156633
 allow radicale_t sysctl_net_t:dir search; # RHBZ#2156633
 allow radicale_t sysctl_net_t:file { read open getattr }; # RHBZ#2156633
 
+allow radicale_t radicale_exec_t:file execute_no_trans; # during upgrade
+
 manage_dirs_pattern(radicale_t, radicale_log_t, radicale_log_t)
 manage_files_pattern(radicale_t, radicale_log_t, radicale_log_t)
 manage_lnk_files_pattern(radicale_t, radicale_log_t, radicale_log_t)
diff --git a/sources b/sources
index 606206e..2e37960 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (radicale-3.1.8.tar.gz) = 5c4b55ee9cfc5060a0e0cf1f284d2c5a354bcabd7a088214e917fabb0083bcd172fd92aeb59b1f869f34e04f8c276efbed15c2a3ff2fdbc81b2220586bbaf31b
+SHA512 (radicale-3.1.9.tar.gz) = f4d0b26149c331b4bc02f01bb637cea1d29e1d563a4133c4293ec13990f1553988181582c2e726ce33b563403a14e9ec863403f86e66b13fd8cfd62cf74439e4