From b62254bcf0b9792aa5eabfa7328a8a1ceb1e066d5a1b7e112b2999b1146541f7 Mon Sep 17 00:00:00 2001
From: Martin Hauke <mardnh@gmx.de>
Date: Wed, 7 Feb 2024 13:00:51 +0000
Subject: [PATCH 1/2] Accepting request 1143569 from home:dimstar:Factory

- Fix build with RPM 4.19: a stray %-escape sequence was found in
  the files section.

OBS-URL: https://build.opensuse.org/request/show/1143569
OBS-URL: https://build.opensuse.org/package/show/network/frr?expand=0&rev=59
---
 frr.changes |  6 ++++++
 frr.spec    | 26 ++++----------------------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/frr.changes b/frr.changes
index 6894d0c..e8f25b8 100644
--- a/frr.changes
+++ b/frr.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb  2 08:25:36 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Fix build with RPM 4.19: a stray %-escape sequence was found in
+  the files section.
+
 -------------------------------------------------------------------
 Mon Dec  4 09:11:46 UTC 2023 - Marius Tomaschewski <mt@suse.com>
 
diff --git a/frr.spec b/frr.spec
index d52b365..2b6447e 100644
--- a/frr.spec
+++ b/frr.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package frr
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 # Copyright (c) 2019-2021, Martin Hauke <mardnh@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
@@ -92,7 +92,7 @@ BuildRequires:  pkgconfig(sqlite3)
 Requires(post): %{install_info_prereq}
 Requires(pre):  %{install_info_prereq}
 Requires(pre):  shadow
-Requires(preun):%{install_info_prereq}
+Requires(preun): %{install_info_prereq}
 Recommends:     logrotate
 Conflicts:      quagga
 Provides:       zebra = %{version}
@@ -193,25 +193,7 @@ The frr-devel package contains the header and object files necessary for
 developing OSPF-API and frr applications.
 
 %prep
-%setup -q -n %{name}-%{name}-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
+%autosetup -n %{name}-%{name}-%{version} -p1
 
 %build
 # GCC LTO objects must be "fat" to avoid assembly errors
@@ -419,7 +401,7 @@ done
 %{_infodir}/frr.info%{?ext_info}
 %{_mandir}/man?/*
 %{_docdir}/%{name}/html
-%{_unitdir}/%%{name}.service
+%{_unitdir}/%{name}.service
 %dir %{_tmpfilesdir}
 %{_tmpfilesdir}/%{name}.conf
 %dir %attr(-,%{frr_user},%{frr_group}) %{_localstatedir}/log/frr

From 2494781aec365e6a48d537eca39de2e324e0330f047fbcba69ac85ebe7e985ce Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 8 Feb 2024 09:08:25 +0000
Subject: [PATCH 2/2] Accepting request 1145054 from home:dimstar:Factory

- Provide user/group symbol for user created during pre.

OBS-URL: https://build.opensuse.org/request/show/1145054
OBS-URL: https://build.opensuse.org/package/show/network/frr?expand=0&rev=60
---
 frr.changes | 5 +++++
 frr.spec    | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/frr.changes b/frr.changes
index e8f25b8..8fbb87d 100644
--- a/frr.changes
+++ b/frr.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  8 06:55:28 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Provide user/group symbol for user created during pre.
+
 -------------------------------------------------------------------
 Fri Feb  2 08:25:36 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/frr.spec b/frr.spec
index 2b6447e..3ecbe6d 100644
--- a/frr.spec
+++ b/frr.spec
@@ -97,6 +97,9 @@ Recommends:     logrotate
 Conflicts:      quagga
 Provides:       zebra = %{version}
 Obsoletes:      zebra < %{version}
+Provides:       group(%{frr_group})
+Provides:       group(%{frrvty_group})
+Provides:       user(%{frr_user})
 
 %description
 FRR is free software which manages TCP/IP based routing protocols.