From b88faed120d5b9b6fd6795a57de81c6825202161a15170aea62ae3b8dc5edee8 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 23 Oct 2020 09:13:04 +0000 Subject: [PATCH 1/3] Accepting request 842623 from home:junknot - Fix unintended package Requires against libpulse0 OBS-URL: https://build.opensuse.org/request/show/842623 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/apulse?expand=0&rev=30 --- apulse.changes | 5 +++++ apulse.spec | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/apulse.changes b/apulse.changes index 18a46b6..b063d36 100644 --- a/apulse.changes +++ b/apulse.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 16 18:17:04 UTC 2020 - Tom Williams + +- Fix unintended package Requires against libpulse0 + ------------------------------------------------------------------- Tue Sep 29 18:17:04 UTC 2020 - Alexei Sorokin diff --git a/apulse.spec b/apulse.spec index 958e47b..896a387 100644 --- a/apulse.spec +++ b/apulse.spec @@ -42,6 +42,10 @@ BuildRequires: pkgconfig(libpulse) >= 5.0 %if %{?_lib} == lib64 Recommends: %{name}-32bit = %{version} %endif +AutoReq: 0 +Requires: libasound2 +Requires: libglib-2_0-0 +Requires: python3-base %description PulseAudio emulation intended to be used with Firefox and Skype. @@ -53,7 +57,9 @@ PulseAudio emulation intended to be used with Firefox and Skype. %cmake \ -DUSE_BUNDLED_PULSEAUDIO_HEADERS=OFF \ -DAPULSEPATH=%{_libdir}/%{name} \ - -DCMAKE_SHARED_LINKER_FLAGS="" -LA + -DCMAKE_SKIP_RPATH:BOOL=ON \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-rpath,%{_libdir}/%{name}" \ + -LA %make_build %install From 8fbbf489ca5da403aa47610ddc7f582e456ac9f424366792e7bc902ea18e54cb Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 26 Oct 2020 14:38:19 +0000 Subject: [PATCH 2/3] Revert the previous change, it seems doing in a wrong way, see SR#843568 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/apulse?expand=0&rev=31 --- apulse.changes | 5 ----- apulse.spec | 8 +------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/apulse.changes b/apulse.changes index b063d36..18a46b6 100644 --- a/apulse.changes +++ b/apulse.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Fri Oct 16 18:17:04 UTC 2020 - Tom Williams - -- Fix unintended package Requires against libpulse0 - ------------------------------------------------------------------- Tue Sep 29 18:17:04 UTC 2020 - Alexei Sorokin diff --git a/apulse.spec b/apulse.spec index 896a387..958e47b 100644 --- a/apulse.spec +++ b/apulse.spec @@ -42,10 +42,6 @@ BuildRequires: pkgconfig(libpulse) >= 5.0 %if %{?_lib} == lib64 Recommends: %{name}-32bit = %{version} %endif -AutoReq: 0 -Requires: libasound2 -Requires: libglib-2_0-0 -Requires: python3-base %description PulseAudio emulation intended to be used with Firefox and Skype. @@ -57,9 +53,7 @@ PulseAudio emulation intended to be used with Firefox and Skype. %cmake \ -DUSE_BUNDLED_PULSEAUDIO_HEADERS=OFF \ -DAPULSEPATH=%{_libdir}/%{name} \ - -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-rpath,%{_libdir}/%{name}" \ - -LA + -DCMAKE_SHARED_LINKER_FLAGS="" -LA %make_build %install From 075339c0179820879ad764dbed9e1f881f84ea3ef934c418c8e37cea6c91ef46 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 26 Jan 2021 14:11:16 +0000 Subject: [PATCH 3/3] Accepting request 864426 from home:iznogood:branches:multimedia:libs - Drop conditional 32bit recommends. OBS-URL: https://build.opensuse.org/request/show/864426 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/apulse?expand=0&rev=32 --- apulse.changes | 5 +++++ apulse.spec | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apulse.changes b/apulse.changes index 18a46b6..3cc9186 100644 --- a/apulse.changes +++ b/apulse.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 19 20:53:29 UTC 2021 - Bjørn Lie + +- Drop conditional 32bit recommends. + ------------------------------------------------------------------- Tue Sep 29 18:17:04 UTC 2020 - Alexei Sorokin diff --git a/apulse.spec b/apulse.spec index 958e47b..0eb18fb 100644 --- a/apulse.spec +++ b/apulse.spec @@ -1,7 +1,7 @@ # # spec file for package apulse # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -39,9 +39,6 @@ BuildRequires: pkgconfig BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libpulse) >= 5.0 -%if %{?_lib} == lib64 -Recommends: %{name}-32bit = %{version} -%endif %description PulseAudio emulation intended to be used with Firefox and Skype.