- Include latest features and fixes from upstream

- Changes to match the Fedora Packaging Guidelines (#1843279 #c1)

baresip.spec

@@ -1,11 +1,13 @@
 Summary:        Modular SIP user-agent with audio and video support
 Name:           baresip
 Version:        0.6.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        BSD
 URL:            http://www.creytiv.com/baresip.html
 Source0:        https://github.com/baresip/baresip/archive/v%{version}/%{name}-%{version}.tar.gz
-Patch0:         baresip-0.6.6-3871768.patch
+Source1:        com.creytiv.baresip.desktop
+# Latest fixes from Git (not yet available in a release)
+Patch0:         baresip-0.6.6-235c021.patch
 BuildRequires:  make
 BuildRequires:  gcc
 BuildRequires:  libre-devel
@@ -14,6 +16,8 @@ BuildRequires:  openssl-devel
 %if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} > 7)
 Recommends:     %{name}-pulse%{?_isa} = %{version}-%{release}
 %endif
+# Patch0 requires "git apply" due to binary patches
+BuildRequires:  git
 
 %description
 A modular SIP user-agent with support for audio and video, and many IETF
@@ -105,7 +109,11 @@ This module implements video codecs using GStreamer 1.0 framework.
 Summary:        GTK+ menu-based user interface module for baresip
 BuildRequires:  pkgconfig(gtk+-2.0) >= 2.22
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
+BuildRequires:  desktop-file-utils
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} > 7)
+Requires:       (gnome-shell-extension-topicons-plus if gnome-shell)
+%endif
 
 %description gtk
 Baresip is a modular SIP user-agent with audio and video support.
@@ -299,7 +307,7 @@ This module provides the X11 grabber video source driver.
 
 %prep
 %setup -q
-%patch0 -p1 -b .3871768
+git apply -p1 < %{PATCH0}
 
 %build
 %make_build \
@@ -307,7 +315,7 @@ This module provides the X11 grabber video source driver.
   RELEASE=1 \
   PREFIX=%{_prefix} \
   MOD_PATH=%{_libdir}/%{name}/modules \
-  EXTRA_CFLAGS="$RPM_OPT_FLAGS" \
+  EXTRA_CFLAGS="$RPM_OPT_FLAGS -DDEFAULT_CAFILE='\"%{_sysconfdir}/pki/tls/certs/ca-bundle.crt\"' -DDEFAULT_AUDIO_DEVICE='\"pulse\"'" \
   EXTRA_LFLAGS="$RPM_LD_FLAGS"
 
 %install
@@ -316,6 +324,9 @@ This module provides the X11 grabber video source driver.
 # Correct module permissions to add executable bit
 chmod 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/*.so
 
+# Install com.creytiv.baresip.desktop file
+desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ %{SOURCE1}
+
 %files
 %license docs/COPYING
 %doc docs/ChangeLog docs/THANKS docs/examples
@@ -326,6 +337,7 @@ chmod 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/*.so
 %{_libdir}/%{name}/modules/aubridge.so
 %{_libdir}/%{name}/modules/aufile.so
 %{_libdir}/%{name}/modules/auloop.so
+%{_libdir}/%{name}/modules/ausine.so
 %{_libdir}/%{name}/modules/b2bua.so
 %{_libdir}/%{name}/modules/cons.so
 %{_libdir}/%{name}/modules/contact.so
@@ -381,6 +393,7 @@ chmod 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/*.so
 
 %files gtk
 %{_libdir}/%{name}/modules/gtk.so
+%{_datadir}/applications/com.creytiv.baresip.desktop
 
 %files jack
 %{_libdir}/%{name}/modules/jack.so
@@ -435,6 +448,10 @@ chmod 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/*.so
 %{_libdir}/%{name}/modules/x11grab.so
 
 %changelog
+* Wed Jul 01 2020 Robert Scheck <robert@fedoraproject.org> 0.6.6-2
+- Include latest features and fixes from upstream
+- Changes to match the Fedora Packaging Guidelines (#1843279 #c1)
+
 * Thu May 28 2020 Robert Scheck <robert@fedoraproject.org> 0.6.6-1
 - Upgrade to 0.6.6 (#1843279)
 - Initial spec file for Fedora and Red Hat Enterprise Linux

com.creytiv.baresip.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=Baresip
+GenericName=SIP softphone
+Comment=Modular SIP user-agent with audio and video support
+Icon=call-start
+Exec=baresip
+Terminal=false
+Categories=GNOME;GTK;Network;Telephony;
+Keywords=VoIP;
+StartupNotify=true