From 5b3ce6006205acb441c928da67447d8b950bb4df1ec64aa38c7bbcc8bca4adb1 Mon Sep 17 00:00:00 2001
From: Danilo Spinella <danilo.spinella@suse.com>
Date: Tue, 20 Feb 2024 10:06:04 +0000
Subject: [PATCH] Accepting request 1147725 from
 home:dspinella:branches:devel:tools:scm

- Do not replace apparmor configuration, fixes bsc#1216545

OBS-URL: https://build.opensuse.org/request/show/1147725
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/git?expand=0&rev=637
---
 git.changes | 5 +++++
 git.spec    | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/git.changes b/git.changes
index 49117a3..e5682f7 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 20 09:56:30 UTC 2024 - Danilo Spinella <danilo.spinella@suse.com>
+
+- Do not replace apparmor configuration, fixes bsc#1216545
+
 -------------------------------------------------------------------
 Thu Feb 15 16:57:56 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
 
diff --git a/git.spec b/git.spec
index 109dbf7..659cfe0 100644
--- a/git.spec
+++ b/git.spec
@@ -539,7 +539,8 @@ fi
 %dir %{_sysconfdir}/apache2/conf.d/
 %config(noreplace) %{_sysconfdir}/apache2/conf.d/gitweb.conf
 %{_datadir}/gitweb
-%{_sysconfdir}/apparmor.d
+%dir %{_sysconfdir}/apparmor.d
+%config(noreplace) %{_sysconfdir}/apparmor.d/usr.share.git-web.gitweb.cgi
 %{gitexecdir}//git-instaweb
 %{gitexecdir}//git-web--browse
 %{_mandir}/man1/*web*1%{?ext_man}