From 93a63ef0a9915b69a56f00fd31fa96b24240182a Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Tue, 23 Jul 2024 23:00:04 +0200 Subject: [PATCH] Upgrade to 3.14.0 (#2299492) --- baresip.spec | 97 +++++++++++++--------------------------------------- sources | 2 +- 2 files changed, 24 insertions(+), 75 deletions(-) diff --git a/baresip.spec b/baresip.spec index 48b1a96..b4859be 100644 --- a/baresip.spec +++ b/baresip.spec @@ -1,7 +1,7 @@ Summary: Modular SIP user-agent with audio and video support Name: baresip -Version: 3.13.0 -Release: 2%{?dist} +Version: 3.14.0 +Release: 1%{?dist} License: BSD-3-Clause URL: https://github.com/baresip/baresip Source0: https://github.com/baresip/baresip/archive/v%{version}/%{name}-%{version}.tar.gz @@ -12,32 +12,16 @@ Source12: https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/raw/master/C 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 BuildRequires: cmake -%if 0%{?rhel} && 0%{?rhel} < 8 -BuildRequires: cmake3 -%endif BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: libre-devel >= 3.13.0 +BuildRequires: libre-devel >= 3.14.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 -%if 0%{?rhel} == 8 +# https://github.com/baresip/re/pull/1015 +BuildRequires: openssl3-devel Recommends: %{name}-pulse%{?_isa} = %{version}-%{release} -%else -Requires: %{name}-pulse%{?_isa} = %{version}-%{release} -%endif %endif Obsoletes: %{name}-cairo < 1.1.0-1 Obsoletes: %{name}-rst < 2.0.0-1 @@ -163,35 +147,26 @@ Summary: GTK+ menu-based user interface module for baresip BuildRequires: pkgconfig(gtk+-3.0) >= 3.0 BuildRequires: pkgconfig(glib-2.0) >= 2.32 BuildRequires: desktop-file-utils -%if 0%{?rhel} == 7 || 0%{?rhel} == 8 +%if 0%{?fedora} || 0%{?rhel} >= 9 +Requires: adwaita-icon-theme >= 3.31.91-1 +Requires: (gnome-shell-extension-appindicator if gnome-shell) +%else License: BSD-3-Clause AND (LGPL-3.0-or-later OR CC-BY-SA-3.0) BuildRequires: librsvg2 BuildRequires: %{_bindir}/gtk-encode-symbolic-svg Requires: adwaita-icon-theme < 3.31.91-1 -%else -Requires: adwaita-icon-theme >= 3.31.91-1 +Requires: (gnome-shell-extension-topicons-plus if gnome-shell) %endif Requires: %{name}%{?_isa} = %{version}-%{release} -%if 0%{?fedora} || 0%{?rhel} > 8 -Requires: (gnome-shell-extension-appindicator if gnome-shell) Recommends: libcanberra-gtk3 -%else -%if 0%{?rhel} == 8 -Requires: (gnome-shell-extension-topicons-plus if gnome-shell) -Recommends: libcanberra-gtk3 -%else -Requires: libcanberra-gtk3 -%endif -%endif %description gtk Baresip is a modular SIP user-agent with audio and video support. This module provides a GTK+ menu-based user interface. -%if 0%{?fedora} || 0%{?rhel} > 7 + Note: GTK+ defaults to the Wayland backend, which baresip does not support. Use 'GDK_BACKEND=x11 baresip' to override it to Xwayland. -%endif %package jack Summary: JACK audio driver for baresip @@ -208,11 +183,7 @@ Summary: MPA speech and audio codec module for baresip BuildRequires: twolame-devel BuildRequires: lame-devel BuildRequires: mpg123-devel -%if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: speexdsp-devel -%else -BuildRequires: speex-devel -%endif Requires: %{name}%{?_isa} = %{version}-%{release} %description mpa @@ -241,7 +212,7 @@ Baresip is a modular SIP user-agent with audio and video support. This module provides the Opus speech and audio codec module. -%if 0%{?fedora} || 0%{?rhel} > 8 +%if 0%{?fedora} || 0%{?rhel} >= 9 %package pipewire Summary: PipeWire audio driver for baresip BuildRequires: pkgconfig(libpipewire-0.3) @@ -373,18 +344,10 @@ This module provides the X11 video output driver. %autosetup -p1 %build -%if 0%{?rhel} && 0%{?rhel} < 8 -%global cmake %cmake3 -%global cmake_build %cmake3_build -%global cmake_install %cmake3_install - -. /opt/rh/devtoolset-8/enable -%endif - %cmake \ -DDEFAULT_CAFILE:PATH="%{_sysconfdir}/pki/tls/certs/ca-bundle.crt" \ -DDEFAULT_CAPATH:PATH="%{_sysconfdir}/pki/tls/certs" \ -%if 0%{?fedora} || 0%{?rhel} > 8 +%if 0%{?fedora} || 0%{?rhel} >= 9 -DDEFAULT_AUDIO_DEVICE:STRING="pipewire" \ %else -DDEFAULT_AUDIO_DEVICE:STRING="pulse" \ @@ -392,9 +355,6 @@ This module provides the X11 video output driver. %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 %cmake_build @@ -404,8 +364,8 @@ This module provides the X11 video output driver. # Install com.github.baresip.desktop file desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ %{SOURCE1} -# Missing status icons for RHEL 7 and 8 (included since adwaita-icon-theme >= 3.31.91) -%if 0%{?rhel} == 7 || 0%{?rhel} == 8 +# Missing status icons for RHEL 8 (included since adwaita-icon-theme >= 3.31.91) +%if 0%{?rhel} == 8 cp -pf %{SOURCE12} %{SOURCE13} %{SOURCE14} . install -D -p -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/icons/Adwaita/scalable/status/call-incoming-symbolic.svg @@ -420,27 +380,13 @@ gtk-encode-symbolic-svg %{SOURCE11} 16x16 -o $RPM_BUILD_ROOT%{_datadir}/icons/Ad install -p -m 0755 tools/fritzbox2%{name} $RPM_BUILD_ROOT%{_bindir}/fritzbox2%{name} %check -%if !0%{?__cmake_in_source_build} && !0%{?__cmake3_in_source_build} -cd %{_vpath_builddir} +%if !0%{?__cmake_in_source_build} +cd %{__cmake_builddir} %endif -./test/selftest +./test/selftest -d %{!?__cmake_in_source_build:../}test/data/ -v %ldconfig_scriptlets -%if 0%{?rhel} == 7 -%post gtk -touch --no-create %{_datadir}/icons/Adwaita &>/dev/null || : - -%postun gtk -if [ $1 -eq 0 ]; then - touch --no-create %{_datadir}/icons/Adwaita &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/Adwaita &>/dev/null || : -fi - -%posttrans gtk -gtk-update-icon-cache %{_datadir}/icons/Adwaita &>/dev/null || : -%endif - %if 0%{?rhel} == 8 %transfiletriggerin -- %{_datadir}/icons/Adwaita gtk-update-icon-cache --force %{_datadir}/icons/Adwaita &>/dev/null || : @@ -532,7 +478,7 @@ gtk-update-icon-cache --force %{_datadir}/icons/Adwaita &>/dev/null || : %files gtk %{_libdir}/%{name}/modules/gtk.so %{_datadir}/applications/com.github.baresip.desktop -%if 0%{?rhel} == 7 || 0%{?rhel} == 8 +%if 0%{?rhel} == 8 %license COPYING*.adwaita-icon-theme %{_datadir}/icons/Adwaita/16x16/status/call-incoming-symbolic.symbolic.png %{_datadir}/icons/Adwaita/16x16/status/call-outgoing-symbolic.symbolic.png @@ -553,7 +499,7 @@ gtk-update-icon-cache --force %{_datadir}/icons/Adwaita &>/dev/null || : %{_libdir}/%{name}/modules/opus.so %{_libdir}/%{name}/modules/opus_multistream.so -%if 0%{?fedora} || 0%{?rhel} > 8 +%if 0%{?fedora} || 0%{?rhel} >= 9 %files pipewire %{_libdir}/%{name}/modules/pipewire.so %endif @@ -592,6 +538,9 @@ gtk-update-icon-cache --force %{_datadir}/icons/Adwaita &>/dev/null || : %{_libdir}/%{name}/modules/x11.so %changelog +* Tue Jul 23 2024 Robert Scheck 3.14.0-1 +- Upgrade to 3.14.0 (#2299492) + * Wed Jul 17 2024 Fedora Release Engineering - 3.13.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 3151a9b..2a2a101 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (baresip-3.13.0.tar.gz) = 891e72286e3e094b496342ccc3f0ba9d4766542d7275a90644dd1dd87c1db5c27d841ee79446deba033b1f0a501e799f1e6f4a32a5c40bff69a64a184e5a27e9 +SHA512 (baresip-3.14.0.tar.gz) = 280172a1b48d2445f7ed4b05dc1b054fb355e6ed58ae62d6aa03ed70e6c9173a648afec76064f08331a0e11fb249456405566de3890cccf1534281aed238991c SHA512 (call-incoming-symbolic.svg) = 49b6422efff9986dd4a18b34df4ab185b01b46c44ab5b8c1d45ab1ca25694cb42e73428b0a69e5fe2eb61c4e7a7aba9c0df82b5e0290f45950f3942be63bf987 SHA512 (call-outgoing-symbolic.svg) = 142cf668d977e3a709d3c13e01d86fdd09e501affd1756df3000de84581c55b3b5082758b32a73ae0e47f45233cc7e55609f3e54effbba01666ca97d5a55fdaa SHA512 (COPYING.adwaita-icon-theme) = e8963bab4d94d9fbcfc930b95164afff9502e4e53209104f4836fcd6dab2c2e9f105c9f9a17b43bc9502903c9c7b2e0880dacf2339cbe110a19654f13742e20a