!55 [sync] PR-53: revert 15.0-7 due to no correct service files
From: @openeuler-sync-bot Reviewed-by: @liqingqing_1229 Signed-off-by: @liqingqing_1229
This commit is contained in:
commit
bc65fccc06
@ -1,25 +0,0 @@
|
|||||||
From 5f945b8da1bf6834ad619c2a9920f3b589ab1fe4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: xiewenhao <xiewenhao@kylinos.com.cn>
|
|
||||||
Date: Wed, 30 Mar 2022 18:21:46 +0800
|
|
||||||
Subject: [PATCH 2/2] Fix-the-problem-that-the-muted-function-in-mate-volu
|
|
||||||
|
|
||||||
---
|
|
||||||
src/daemon/systemd/user/pulseaudio.service.in | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/daemon/systemd/user/pulseaudio.service.in b/src/daemon/systemd/user/pulseaudio.service.in
|
|
||||||
index bf0f481..a84a978 100644
|
|
||||||
--- a/src/daemon/systemd/user/pulseaudio.service.in
|
|
||||||
+++ b/src/daemon/systemd/user/pulseaudio.service.in
|
|
||||||
@@ -14,7 +14,7 @@ Description=Sound Service
|
|
||||||
# After=pulseaudio.socket is not needed, as it is already implicit in the
|
|
||||||
# socket-service relationship, see systemd.socket(5).
|
|
||||||
Requires=pulseaudio.socket
|
|
||||||
-ConditionUser=!root
|
|
||||||
+#ConditionUser=!root
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
ExecStart=@PA_BINARY@ --daemonize=no --log-target=journal
|
|
||||||
--
|
|
||||||
2.33.0
|
|
||||||
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
From 02f3bde2031dfb6c8a6bb4458282f93ad563035a Mon Sep 17 00:00:00 2001
|
|
||||||
From: xiewenhao <xiewenhao@kylinos.com.cn>
|
|
||||||
Date: Wed, 30 Mar 2022 18:25:36 +0800
|
|
||||||
Subject: [PATCH 2/2] fix-mate-volume-control-status-icon-doesn-t-work
|
|
||||||
|
|
||||||
---
|
|
||||||
src/daemon/systemd/user/pulseaudio.socket | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/daemon/systemd/user/pulseaudio.socket b/src/daemon/systemd/user/pulseaudio.socket
|
|
||||||
index 98c1002..95247c1 100644
|
|
||||||
--- a/src/daemon/systemd/user/pulseaudio.socket
|
|
||||||
+++ b/src/daemon/systemd/user/pulseaudio.socket
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
[Unit]
|
|
||||||
Description=Sound System
|
|
||||||
-ConditionUser=!root
|
|
||||||
+#ConditionUser=!root
|
|
||||||
|
|
||||||
[Socket]
|
|
||||||
Priority=6
|
|
||||||
--
|
|
||||||
2.33.0
|
|
||||||
@ -6,7 +6,7 @@
|
|||||||
Name: pulseaudio
|
Name: pulseaudio
|
||||||
Summary: Improved Linux Sound Server
|
Summary: Improved Linux Sound Server
|
||||||
Version: 15.0
|
Version: 15.0
|
||||||
Release: 7
|
Release: 8
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: https://www.freedesktop.org/wiki/Software/PulseAudio
|
URL: https://www.freedesktop.org/wiki/Software/PulseAudio
|
||||||
Source0: https://freedesktop.org/software/pulseaudio/releases/pulseaudio-%{version}.tar.xz
|
Source0: https://freedesktop.org/software/pulseaudio/releases/pulseaudio-%{version}.tar.xz
|
||||||
@ -15,8 +15,6 @@ Source5: default.pa-for-gdm
|
|||||||
|
|
||||||
Patch201: pulseaudio-autostart.patch
|
Patch201: pulseaudio-autostart.patch
|
||||||
Patch202: 0001-fix-translation-error-of-pulseaudio.patch
|
Patch202: 0001-fix-translation-error-of-pulseaudio.patch
|
||||||
Patch203: 0002-fix-mate-volume-control-status-icon-doesn-t-work.patch
|
|
||||||
Patch204: 0002-Fix-the-problem-that-the-muted-function-in-mate-volu.patch
|
|
||||||
|
|
||||||
BuildRequires: meson
|
BuildRequires: meson
|
||||||
BuildRequires: automake libtool gcc-c++ bash-completion
|
BuildRequires: automake libtool gcc-c++ bash-completion
|
||||||
@ -156,14 +154,6 @@ exit 0
|
|||||||
|
|
||||||
%ldconfig_scriptlets
|
%ldconfig_scriptlets
|
||||||
|
|
||||||
%post
|
|
||||||
%systemd_user_post pulseaudio.service
|
|
||||||
%systemd_user_post pulseaudio.socket
|
|
||||||
|
|
||||||
%preun
|
|
||||||
%systemd_user_preun pulseaudio.service
|
|
||||||
%systemd_user_preun pulseaudio.socket
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%license LICENSE GPL LGPL
|
%license LICENSE GPL LGPL
|
||||||
@ -244,6 +234,9 @@ exit 0
|
|||||||
%{_mandir}/man*/*
|
%{_mandir}/man*/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Aug 04 2022 Qingqing Li <liqingqing3@huawei.com> - 15.0.8
|
||||||
|
- revert 15.0-7 due to no correct service files
|
||||||
|
|
||||||
* Tue Aug 02 2022 ouyangminxiang <ouyangminxiang@kylinsec.com.cn> - 15.0-7
|
* Tue Aug 02 2022 ouyangminxiang <ouyangminxiang@kylinsec.com.cn> - 15.0-7
|
||||||
- Fix mate-volume-control-status-icon doesn't work
|
- Fix mate-volume-control-status-icon doesn't work
|
||||||
- Fix the problem that the muted function in mate-volume-control-status-icon doesn't work when the system is boot
|
- Fix the problem that the muted function in mate-volume-control-status-icon doesn't work when the system is boot
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user