Accepting request 714700 from home:1Antoine1:branches:multimedia:libs

- Remove SuSEfirewall2 service since SuSEfirewall2 has been
  replaced by firewalld (which already provides a service for
  pulseaudio).
- Remove some obsolete macros and conditionals.

OBS-URL: https://build.opensuse.org/request/show/714700
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=207
This commit is contained in:
Tomáš Chvátal 2019-07-11 18:35:13 +00:00 committed by Git OBS Bridge
parent 8c570610a3
commit d03ae33675
3 changed files with 15 additions and 29 deletions

View File

@ -1,3 +0,0 @@
## Name: PulseAudio server (TCP)
## Description: Ports for PulseAudio network access (for module-native-protocol-tcp)
TCP="4713"

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jul 11 17:50:21 UTC 2019 - Antoine Belvire <antoine.belvire@opensuse.org>
- Remove SuSEfirewall2 service since SuSEfirewall2 has been
replaced by firewalld (which already provides a service for
pulseaudio).
- Remove some obsolete macros and conditionals.
-------------------------------------------------------------------
Tue Jun 11 13:28:38 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package pulseaudio
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -24,20 +24,18 @@
%define drvver 12.2
%define soname 0
%define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
%define _bashcompletionsdir %{_datadir}/bash-completion/completions
Name: pulseaudio
Version: 12.2
Release: 0
Summary: A Networked Sound Server
License: GPL-2.0+ AND LGPL-2.1+
License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: System/Sound Daemons
Url: http://pulseaudio.org
Source: http://www.freedesktop.org/software/pulseaudio/releases/%{name}-%{version}.tar.xz
Source1: default.pa-for-gdm
Source2: setup-pulseaudio
Source3: sysconfig.sound-pulseaudio
Source4: pulseaudio-server.fw
Source5: pulseaudio.service
Source6: disable_flat_volumes.conf
Source7: pulseaudio.tmpfiles
@ -70,20 +68,20 @@ BuildRequires: libwebrtc_audio_processing-devel >= 0.3
BuildRequires: lirc-devel
BuildRequires: orc >= 0.4.9
BuildRequires: pkgconfig
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(libsystemd)
BuildRequires: speexdsp-devel
BuildRequires: systemd-rpm-macros
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(bash-completion)
BuildRequires: pkgconfig(dbus-1) >= 1.4.12
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(sbc) >= 1.0
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(soxr)
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(tdb)
BuildRequires: pkgconfig(udev)
BuildRequires: pkgconfig(x11)
@ -95,6 +93,7 @@ Requires: udev >= 146
## needs the same liborc version which was used to build against
%requires_eq liborc-0_4-0
Requires(post): %fillup_prereq
Requires(pre): group(audio)
Requires(pre): shadow
Recommends: %{name}-bash-completion
Recommends: %{name}-lang
@ -105,12 +104,6 @@ Obsoletes: libpulsecore9 < 0.9.15
Provides: libpulsecore9 = 0.9.15
Obsoletes: libpulsecore7 < 0.9.13
Provides: libpulsecore7 = 0.9.13
%if 0%{?suse_version} > 1320
BuildRequires: speexdsp-devel
Requires(pre): group(audio)
%else
BuildRequires: speex-devel
%endif
%description
pulseaudio is a networked sound server for Linux, other Unix like
@ -396,8 +389,6 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
# some HW may get undetected without this (check pulseaudio 6.0RC1 announce)
ln -s default.conf %{buildroot}%{_datadir}/pulseaudio/alsa-mixer/profile-sets/extra-hdmi.conf
# openSUSE 11.3 cannot find the .desktop files
%suse_update_desktop_file pulseaudio
%find_lang %{name}
install %{SOURCE2} %{buildroot}%{_bindir}
chmod 755 %{buildroot}%{_bindir}/setup-pulseaudio
@ -412,11 +403,6 @@ install -m 644 %{SOURCE8} %{buildroot}%{_prefix}/lib/tmpfiles.d/pulseaudio-gdm-h
mkdir -p %{buildroot}%{_prefix}/share/factory/var/lib/gdm/.pulse
install -m 644 %{SOURCE1} %{buildroot}%{_prefix}/share/factory/var/lib/gdm/.pulse/default.pa
ln -s esdcompat %{buildroot}%{_bindir}/esd
# install firewall rule on SUSE
%if %{defined suse_version}
mkdir -p %{buildroot}/%{_fwdefdir}
install -m 0644 %{SOURCE4} %{buildroot}/%{_fwdefdir}/pulseaudio-server
%endif
# create .d conf dirs (since 8.0)
mkdir -p %{buildroot}%{_sysconfdir}/pulse/client.conf.d
install -m 0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pulse/client.conf.d/50-system.conf
@ -563,9 +549,7 @@ exit 0
%{_libdir}/pulse-%{drvver}/modules/module-suspend-on-idle.so
%{_libdir}/pulse-%{drvver}/modules/module-switch-on-connect.so
%{_libdir}/pulse-%{drvver}/modules/module-switch-on-port-available.so
%if 0%{?suse_version} >= 1210
%{_libdir}/pulse-%{drvver}/modules/module-systemd-login.so
%endif
%{_libdir}/pulse-%{drvver}/modules/module-tunnel-sink.so
%{_libdir}/pulse-%{drvver}/modules/module-tunnel-sink-new.so
%{_libdir}/pulse-%{drvver}/modules/module-tunnel-source.so
@ -598,9 +582,6 @@ exit 0
%{_prefix}/lib/tmpfiles.d/pulseaudio.conf
%ghost %dir %{_localstatedir}/lib/pulseaudio
%if %{defined suse_version}
%config(noreplace) %{_fwdefdir}/pulseaudio-server
%endif
# created by setup-pulseaudio script
%ghost %{_sysconfdir}/profile.d/pulseaudio.sh
%ghost %{_sysconfdir}/profile.d/pulseaudio.csh