From 543dca246d9653824edd989b3ad599dfd01fa7b9 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 20 Nov 2024 13:27:33 +0000 Subject: [PATCH] import RHEL 10 Beta pavucontrol-6.0-3.el10 --- .gitignore | 3 +- ...e-freedesktop.org-standard-icon-name.patch | 34 ----- gating.yaml | 6 - org.pulseaudio.pavucontrol.appdata.xml | 43 ++++++ pavucontrol.spec | 123 ++++++++++++++---- sources | 2 +- 6 files changed, 145 insertions(+), 66 deletions(-) delete mode 100644 0001-Use-freedesktop.org-standard-icon-name.patch delete mode 100644 gating.yaml create mode 100644 org.pulseaudio.pavucontrol.appdata.xml diff --git a/.gitignore b/.gitignore index a555ea3..bb39eae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/pavucontrol-3.0.tar.xz -/pavucontrol-3.0.tar.xz +pavucontrol-6.0.tar.xz diff --git a/0001-Use-freedesktop.org-standard-icon-name.patch b/0001-Use-freedesktop.org-standard-icon-name.patch deleted file mode 100644 index a1edea2..0000000 --- a/0001-Use-freedesktop.org-standard-icon-name.patch +++ /dev/null @@ -1,34 +0,0 @@ -From bd76be12abfff4427231567404b41843417e6332 Mon Sep 17 00:00:00 2001 -From: "Paul W. Frields" -Date: Fri, 31 Jul 2015 15:36:14 -0400 -Subject: [PATCH] Use freedesktop.org standard icon name - ---- - src/pavucontrol.glade | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/pavucontrol.glade b/src/pavucontrol.glade -index 219f5a2..5efd4b3 100644 ---- a/src/pavucontrol.glade -+++ b/src/pavucontrol.glade -@@ -312,7 +312,7 @@ - - True - False -- stock_lock -+ security-medium - 1 - - -@@ -1474,7 +1474,7 @@ - - True - False -- stock_lock -+ security-medium - 1 - - --- -2.4.3 - diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index ea86f9d..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional} diff --git a/org.pulseaudio.pavucontrol.appdata.xml b/org.pulseaudio.pavucontrol.appdata.xml new file mode 100644 index 0000000..eee5255 --- /dev/null +++ b/org.pulseaudio.pavucontrol.appdata.xml @@ -0,0 +1,43 @@ + + + + org.pulseaudio.pavucontrol + pavucontrol + pavucontrol.desktop + PulseAudio Volume Control + Adjust the volume level of hardware devices and applications + +

PulseAudio Volume Control (pavucontrol) is a volume control tool (“mixer”) for the PulseAudio sound server. In contrast to classic mixer tools, this one allows you to control both the volume of hardware devices and of each playback stream separately.

+ + + pavucontrol.desktop + + + + The “Playback” tab + https://freedesktop.org/software/pulseaudio/pavucontrol/screenshots/pavucontrol-playback.png + + + The “Recording” tab + https://freedesktop.org/software/pulseaudio/pavucontrol/screenshots/pavucontrol-record.png + + + The “Output” tab + https://freedesktop.org/software/pulseaudio/pavucontrol/screenshots/pavucontrol-output.png + + + The “Input” tab + https://freedesktop.org/software/pulseaudio/pavucontrol/screenshots/pavucontrol-input.png + + + The “Configuration” tab + https://freedesktop.org/software/pulseaudio/pavucontrol/screenshots/pavucontrol-config.png + + + + CC0-1.0 + GPL-2.0+ + https://freedesktop.org/software/pulseaudio/pavucontrol/ + https://gitlab.freedesktop.org/pulseaudio/pavucontrol/issues + https://gitlab.freedesktop.org/pulseaudio/pavucontrol/issues/new + diff --git a/pavucontrol.spec b/pavucontrol.spec index 2d869d7..b176c4f 100644 --- a/pavucontrol.spec +++ b/pavucontrol.spec @@ -1,21 +1,33 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.6.1) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 3; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + Name: pavucontrol -Version: 3.0 -Release: 11%{?dist} +Version: 6.0 +Release: %autorelease Summary: Volume control for PulseAudio -Group: Applications/Multimedia -License: GPLv2+ +License: GPL-2.0-or-later URL: http://freedesktop.org/software/pulseaudio/%{name} Source0: http://freedesktop.org/software/pulseaudio/%{name}/%{name}-%{version}.tar.xz -# Fix icons with adwaita-icon-theme -Patch0: 0001-Use-freedesktop.org-standard-icon-name.patch +Source1: org.pulseaudio.pavucontrol.appdata.xml -BuildRequires: pulseaudio-libs-devel >= 3.0 -BuildRequires: gtkmm30-devel -BuildRequires: libsigc++20-devel lynx BuildRequires: desktop-file-utils -BuildRequires: libcanberra-devel -BuildRequires: intltool +BuildRequires: libappstream-glib +BuildRequires: gcc-c++ +BuildRequires: gettext +BuildRequires: meson >= 0.59.0 +BuildRequires: lynx +BuildRequires: pkgconfig(gtkmm-4.0) +BuildRequires: pkgconfig(json-glib-1.0) +BuildRequires: pkgconfig(libpulse-mainloop-glib) +BuildRequires: pkgconfig(sigc++-2.0) %description PulseAudio Volume Control (pavucontrol) is a simple GTK based volume control @@ -24,34 +36,97 @@ tools this one allows you to control both the volume of hardware devices and of each playback stream separately. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build -%configure -make V=1 %{?_smp_mflags} +%meson +%meson_build %install -rm -rf $RPM_BUILD_ROOT -make V=1 install DESTDIR=$RPM_BUILD_ROOT +%meson_install -rm $RPM_BUILD_ROOT/usr/share/doc/pavucontrol/README -rm $RPM_BUILD_ROOT/usr/share/doc/pavucontrol/README.html -rm $RPM_BUILD_ROOT/usr/share/doc/pavucontrol/style.css +rm -f $RPM_BUILD_ROOT%{_docdir}/pavucontrol/README.html +rm -f $RPM_BUILD_ROOT%{_docdir}/pavucontrol/style.css %find_lang %{name} +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 +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 +## START: Generated by rpmautospec +* Mon Jun 24 2024 Troy Dawson - 6.0-3 +- Bump release for June 2024 mass rebuild + +* Thu May 30 2024 Tomas Pelka - 6.0-2 +- Add gating.yaml via API + +* Fri May 24 2024 Wim Taymans - 6.0-1 +- upgrade to 6.0 + +* Thu Jan 25 2024 Fedora Release Engineering - 5.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 5.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jan 03 2024 Niels De Graef - 5.0-10 +- SPDX Migration + +* Thu Jul 20 2023 Fedora Release Engineering - 5.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 5.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 5.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 4.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 4.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 4.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jun 13 2020 Julian Sikorski - 4.0-4 +- Fix crash on Ctrl-Q using a patch from upstream gitlab (RH #1725150) + +* Wed Jan 29 2020 Fedora Release Engineering - 4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jul 26 2019 Fedora Release Engineering - 4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Mar 05 2019 Kalev Lember - 4.0-1 +- Update to 4.0 + +* Fri Feb 01 2019 Fedora Release Engineering - 3.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 3.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Mar 07 2018 Rex Dieter - 3.0-12 +- BR: gcc-c++ +- .spec cosmetics +- %%build: --disable-silent-rules +- use %%make_build %%make_install + * Thu Feb 08 2018 Fedora Release Engineering - 3.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -222,3 +297,5 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/pavucontrol.deskto * Mon May 29 2006 Pierre Ossman 0.9.0-1 - Initial package for Fedora Extras + +## END: Generated by rpmautospec diff --git a/sources b/sources index 72dc4be..8272781 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pavucontrol-3.0.tar.xz) = 3562fc50e5f60c6b6280c2d524e13cf44114bf481e5ec98b8714c7c2f162d0332179ebcf4c5a78d86f511de857bdc3aa7415e1548e0c10d4582b5958c4cacae9 +SHA512 (pavucontrol-6.0.tar.xz) = 3e43f3b6e04e90ccaa5a758ec7c88e816ded2739de20af38159f2ca27cf588cce6d7dce87a4f1c162754a8753cd39bf0e01ec6d6d2e00223fa36369e73a19a49