From fe1cc5a1705cb418f3e3b379a31f447414210f45 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 22 May 2024 15:28:19 +0200
Subject: [PATCH] upgrade to 6.0

Resolves: RHEL-35527
---
 .gitignore       |  1 +
 pavucontrol.spec | 26 +++++++++++---------------
 sources          |  2 +-
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index fd42546..d6d5b97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ pavucontrol-0.9.10.tar.gz
 /pavucontrol-3.0.tar.xz
 /pavucontrol-4.0.tar.xz
 /pavucontrol-5.0.tar.xz
+/pavucontrol-6.0.tar.xz
diff --git a/pavucontrol.spec b/pavucontrol.spec
index 99a0b7f..3445a75 100644
--- a/pavucontrol.spec
+++ b/pavucontrol.spec
@@ -1,5 +1,5 @@
 Name:           pavucontrol
-Version:        5.0
+Version:        6.0
 Release:        %autorelease
 Summary:        Volume control for PulseAudio
 
@@ -11,12 +11,11 @@ Source1:        org.pulseaudio.pavucontrol.appdata.xml
 BuildRequires:  desktop-file-utils
 BuildRequires:  libappstream-glib
 BuildRequires:  gcc-c++
-BuildRequires:  intltool
+BuildRequires:  gettext
+BuildRequires:  meson >= 0.59.0
 BuildRequires:  lynx
-BuildRequires:  make
-BuildRequires:  pkgconfig(gtkmm-3.0)
+BuildRequires:  pkgconfig(gtkmm-4.0)
 BuildRequires:  pkgconfig(json-glib-1.0)
-BuildRequires:  pkgconfig(libcanberra-gtk3)
 BuildRequires:  pkgconfig(libpulse-mainloop-glib)
 BuildRequires:  pkgconfig(sigc++-2.0)
 
@@ -30,15 +29,12 @@ of each playback stream separately.
 %autosetup -p1
 
 %build
-%configure \
-  --disable-silent-rules
-
-%make_build V=1
+%meson
+%meson_build
 
 %install
-%make_install V=1
+%meson_install
 
-rm -f $RPM_BUILD_ROOT%{_docdir}/pavucontrol/README
 rm -f $RPM_BUILD_ROOT%{_docdir}/pavucontrol/README.html
 rm -f $RPM_BUILD_ROOT%{_docdir}/pavucontrol/style.css
 
@@ -48,16 +44,16 @@ mkdir -p $RPM_BUILD_ROOT%{_metainfodir}
 install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/
 
 %check
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/pavucontrol.desktop
-appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/org.pulseaudio.pavucontrol.appdata.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/org.pulseaudio.pavucontrol.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.pulseaudio.pavucontrol.appdata.xml
 
 %files -f %{name}.lang
 %license LICENSE
 %doc doc/README
 %{_bindir}/pavucontrol
-%{_datadir}/pavucontrol
-%{_datadir}/applications/pavucontrol.desktop
+%{_datadir}/applications/org.pulseaudio.pavucontrol.desktop
 %{_metainfodir}/org.pulseaudio.pavucontrol.appdata.xml
+%{_metainfodir}/org.pulseaudio.pavucontrol.metainfo.xml
 
 %changelog
 %autochangelog
diff --git a/sources b/sources
index 582bc39..8272781 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pavucontrol-5.0.tar.xz) = 5673d783c2c819a68b49025c051bedd39f4caba446a479797b06569e24a96acc0924ba680d2416baff8c3211cfc7c94760d503900207fbe7c89c5cb2adaebec1
+SHA512 (pavucontrol-6.0.tar.xz) = 3e43f3b6e04e90ccaa5a758ec7c88e816ded2739de20af38159f2ca27cf588cce6d7dce87a4f1c162754a8753cd39bf0e01ec6d6d2e00223fa36369e73a19a49