From d4e900835f49a28e757b63b256e41d2591c0de21 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Thu, 28 Dec 2023 08:03:18 +0100
Subject: [PATCH] Upgrade to 3.8.0 (#2256050)

---
 baresip-3.8.0-rpath.patch | 28 ++++++++++++++++++++++++++++
 baresip.spec              | 26 +++++++++++++++++++-------
 sources                   |  2 +-
 3 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 baresip-3.8.0-rpath.patch

diff --git a/baresip-3.8.0-rpath.patch b/baresip-3.8.0-rpath.patch
new file mode 100644
index 0000000..b6372df
--- /dev/null
+++ b/baresip-3.8.0-rpath.patch
@@ -0,0 +1,28 @@
+From ad6a48ad4a10580841cb5b07b27a96a26b26ada1 Mon Sep 17 00:00:00 2001
+From: Robert Scheck <robert@fedoraproject.org>
+Date: Thu, 28 Dec 2023 07:50:39 +0100
+Subject: [PATCH] cmake: add only non-system link paths to rpath (fixes #2849)
+
+---
+ CMakeLists.txt | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 822f4ccdb..3dd2c0a73 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -54,8 +54,12 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+ set(CMAKE_C_STANDARD 11)
+ set(CMAKE_C_EXTENSIONS OFF)
+ 
+-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
++list(FIND CMAKE_C_IMPLICIT_LINK_DIRECTORIES
++  "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" IS_SYSTEM_DIR)
++if(IS_SYSTEM_DIR STREQUAL "-1")
++  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
++  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
++endif()
+ 
+ if(MSVC)
+   add_compile_options("/W3")
diff --git a/baresip.spec b/baresip.spec
index 2d9286f..27c0d01 100644
--- a/baresip.spec
+++ b/baresip.spec
@@ -1,6 +1,6 @@
 Summary:        Modular SIP user-agent with audio and video support
 Name:           baresip
-Version:        3.7.0
+Version:        3.8.0
 Release:        1%{?dist}
 License:        BSD-3-Clause
 URL:            https://github.com/baresip/baresip
@@ -11,20 +11,26 @@ Source11:       https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/raw/1e1d6921
 Source12:       https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/raw/master/COPYING#/COPYING.adwaita-icon-theme
 Source13:       https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/raw/master/COPYING_CCBYSA3#/COPYING_CCBYSA3.adwaita-icon-theme
 Source14:       https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/raw/master/COPYING_LGPL#/COPYING_LGPL.adwaita-icon-theme
+Patch0:         https://github.com/baresip/baresip/pull/2850/commits/ad6a48ad4a10580841cb5b07b27a96a26b26ada1.patch#/baresip-3.8.0-rpath.patch
 BuildRequires:  cmake
 %if 0%{?rhel} && 0%{?rhel} < 8
 BuildRequires:  cmake3
 %endif
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
-BuildRequires:  libre-devel >= 3.7.0
-%if 0%{?fedora} || 0%{?rhel} >= 8
-BuildRequires:  openssl-devel >= 1.1.0
+BuildRequires:  libre-devel >= 3.8.0
+%if 0%{?fedora} || 0%{?rhel} >= 9
+BuildRequires:  openssl-devel
+%else
+%if 0%{?rhel} >= 8
+# https://github.com/baresip/re/pull/1015
+BuildRequires:  openssl3-devel
 %else
 BuildRequires:  openssl11-devel
 # Atomic support in libre >= 2.1.0
 BuildRequires:  devtoolset-8-toolchain
 %endif
+%endif
 %if 0%{?fedora} || 0%{?rhel} > 8
 Recommends:     %{name}-pipewire%{?_isa} = %{version}-%{release}
 %else
@@ -365,7 +371,7 @@ Baresip is a modular SIP user-agent with audio and video support.
 This module provides the X11 video output driver.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %if 0%{?rhel} && 0%{?rhel} < 8
@@ -383,7 +389,10 @@ This module provides the X11 video output driver.
 %else
   -DDEFAULT_AUDIO_DEVICE:STRING="pulse" \
 %endif
-%if 0%{?rhel} && 0%{?rhel} < 8
+%if 0%{?rhel} == 8
+  -DOPENSSL_ROOT_DIR:PATH="%{_includedir}/openssl3;%{_libdir}/openssl3"
+%endif
+%if 0%{?rhel} == 7
   -DOPENSSL_ROOT_DIR:PATH="%{_includedir}/openssl11;%{_libdir}/openssl11"
 %endif
 
@@ -444,7 +453,7 @@ gtk-update-icon-cache --force %{_datadir}/icons/Adwaita &>/dev/null || :
 %license LICENSE
 %doc CHANGELOG.md docs/THANKS docs/examples
 %{_bindir}/%{name}
-%{_libdir}/lib%{name}.so.11*
+%{_libdir}/lib%{name}.so.12*
 %dir %{_libdir}/%{name}/
 %dir %{_libdir}/%{name}/modules/
 %{_libdir}/%{name}/modules/account.so
@@ -584,6 +593,9 @@ gtk-update-icon-cache --force %{_datadir}/icons/Adwaita &>/dev/null || :
 %{_libdir}/%{name}/modules/x11.so
 
 %changelog
+* Thu Dec 28 2023 Robert Scheck <robert@fedoraproject.org> 3.8.0-1
+- Upgrade to 3.8.0 (#2256050)
+
 * Sun Nov 26 2023 Robert Scheck <robert@fedoraproject.org> 3.7.0-1
 - Upgrade to 3.7.0 (#2251125)
 
diff --git a/sources b/sources
index 9a9409f..4f4e32e 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (baresip-3.7.0.tar.gz) = f3497a903fa67c8ecfb90cd63f9f2bdc376d98ea28a71ea64b042b3641628126fac5ff8afe8539f98f51a54aa4ef1304d22c0b83edc3e91767f8bf35310621c3
+SHA512 (baresip-3.8.0.tar.gz) = 12ff9aaedcc3bc19a38235f5abc955aa1a64db47827895b95ca55329cb29acef353ee0871e888f12f0a9ea5a2ac0b3a34c278115c05e9f55d055638b5e13f852
 SHA512 (call-incoming-symbolic.svg) = 49b6422efff9986dd4a18b34df4ab185b01b46c44ab5b8c1d45ab1ca25694cb42e73428b0a69e5fe2eb61c4e7a7aba9c0df82b5e0290f45950f3942be63bf987
 SHA512 (call-outgoing-symbolic.svg) = 142cf668d977e3a709d3c13e01d86fdd09e501affd1756df3000de84581c55b3b5082758b32a73ae0e47f45233cc7e55609f3e54effbba01666ca97d5a55fdaa
 SHA512 (COPYING.adwaita-icon-theme) = e8963bab4d94d9fbcfc930b95164afff9502e4e53209104f4836fcd6dab2c2e9f105c9f9a17b43bc9502903c9c7b2e0880dacf2339cbe110a19654f13742e20a