From ef94ecd13e6ce811da7f80a8c5e4ef6017b4572d Mon Sep 17 00:00:00 2001
From: Zdenek Pytela <zpytela@redhat.com>
Date: Oct 20 2021 07:58:56 +0000
Subject: Merge branch 'f35' of ssh://pkgs.fedoraproject.org/rpms/selinux-policy into f35


---

diff --git a/selinux-policy.spec b/selinux-policy.spec
index 8db3f4f..4f3f55b 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -1,6 +1,10 @@
 # github repo with selinux-policy sources
 %global giturl https://github.com/fedora-selinux/selinux-policy
+<<<<<<< HEAD
 %global commit c454679cbae00ff11adb94549e559444b9167ba3
+=======
+%global commit 94970fc5c9be2023139080e4e0751780d35af7fe
+>>>>>>> 70f88fb2b866d092e19d4a37e339c631ab9ae7b0
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 %define distro redhat
@@ -24,7 +28,11 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 35.3
+<<<<<<< HEAD
 Release: 1%{?dist}
+=======
+Release: 1.20211019git%{shortcommit}%{?dist}
+>>>>>>> 70f88fb2b866d092e19d4a37e339c631ab9ae7b0
 License: GPLv2+
 Source: %{giturl}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
 Source1: modules-targeted-base.conf
@@ -808,9 +816,13 @@ exit 0
 %endif
 
 %changelog
-* Tue Oct 19 2021 Zdenek Pytela <zpytela@redhat.com> - 35.3-1
+* Tue Oct 19 2021 Adam Williamson <awilliam@redhat.com> - 35.3-1.20211019git94970fc
+- Allow fedora-third-party map generic cache files
+- Add gnome_map_generic_cache_files() interface
+- Add files_manage_var_lib_dirs() interface
+- Allow fedora-third party manage gpg keys
+- Allow fedora-third-party run "flatpak remote-add --from flathub"
 - Allow fedora-third-party run flatpak post-install actions
-- Allow fedora-third-party set_setsched and sys_nice
 
 * Mon Oct 18 2021 Zdenek Pytela <zpytela@redhat.com> - 35.2-1
 - Allow fedora-third-party execute "flatpak remote-add"
diff --git a/sources b/sources
index 7888307..b687e14 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (selinux-policy-c454679.tar.gz) = 1ff87898ebf6edd8b193a3aa030bcc7a67616d8d4ec3f72bc394f4ce57136d599b8a777dcbe1c55c2c3c6d18a657cdd44b14edd402d46ddf9cb00557cde9a5ee
-SHA512 (container-selinux.tgz) = cfc7dd39cb5e432784ba48b19a3be29a16433958fdf431988c7531cf4f03ac3f3d8718bac3ff9aae8b81c0eed8e974c35ecd4e60a871daa91809feff917fd37e
+SHA512 (selinux-policy-94970fc.tar.gz) = 2646fe2bd27878e9c639ca5d6ea19a74cb7484d22efda73697dd38d745449e583391114c0f45cb59ade2f66ed188cd35fe49c10067f619c61bf2e7c78a30cdeb
+SHA512 (container-selinux.tgz) = 96bf41995ca8eb7d70e9d95b362e5858fa7ac2469106f5a713088e73c3aa65046a4cb0dc1139bd2fd1809ba485bb686c05d5751f1da4811d9fd21fde48be49c9
 SHA512 (macro-expander) = 243ee49f1185b78ac47e56ca9a3f3592f8975fab1a2401c0fcc7f88217be614fe31805bacec602b728e7fcfc21dcc17d90e9a54ce87f3a0c97624d9ad885aea4