Attachment 853904 Details for Bug 1056619 – some improvements to the spec file

[patch] some improvements to the spec file

0001-Don-t-build-jack-and-lirc-on-rhel.patch (text/plain), 3.61 KB, created by Wim Taymans on 2014-01-22 15:09:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wim Taymans

Created: 2014-01-22 15:09:12 UTC

Size: 3.61 KB

patch

obsolete

>From 46977d3d9ff17cdd53660e95c3f6c3d48a7e8e04 Mon Sep 17 00:00:00 2001
>From: Wim Taymans <wtaymans@redhat.com>
>Date: Wed, 22 Jan 2014 15:49:13 +0100
>Subject: [PATCH] Don't build jack and lirc on rhel
>
>- Add more Requires to avoid testing against multiple versions
>---
> pulseaudio.spec | 16 +++++++++++++++-
> 1 file changed, 15 insertions(+), 1 deletion(-)
>
>diff --git a/pulseaudio.spec b/pulseaudio.spec
>index 24ac2bb..0a9a574 100644
>--- a/pulseaudio.spec
>+++ b/pulseaudio.spec
>@@ -12,7 +12,7 @@
> Name:           pulseaudio
> Summary:        Improved Linux Sound Server
> Version:        %{pa_major}%{?pa_minor:.%{pa_minor}}
>-Release:        9%{?gitcommit:.git%{shortcommit}}%{?dist}
>+Release:        10%{?gitcommit:.git%{shortcommit}}%{?dist}
> License:        LGPLv2+
> URL:            http://www.freedesktop.org/wiki/Software/PulseAudio
> %if 0%{?gitrel}
>@@ -108,6 +108,7 @@ and start PulseAudio with EsounD protocol modules.
> %package module-lirc
> Summary:        LIRC support for the PulseAudio sound server
> Requires:       %{name}%{?_isa} = %{version}-%{release}
>+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
> 
> %description module-lirc
> LIRC volume control module for the PulseAudio sound server.
>@@ -116,6 +117,7 @@ LIRC volume control module for the PulseAudio sound server.
> %package module-x11
> Summary:        X11 support for the PulseAudio sound server
> Requires:       %{name}%{?_isa} = %{version}-%{release}
>+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
> Requires:       %{name}-utils
> 
> %description module-x11
>@@ -124,6 +126,7 @@ X11 bell and security modules for the PulseAudio sound server.
> %package module-zeroconf
> Summary:        Zeroconf support for the PulseAudio sound server
> Requires:       %{name}%{?_isa} = %{version}-%{release}
>+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
> Requires:       %{name}-utils
> 
> %description module-zeroconf
>@@ -132,6 +135,7 @@ Zeroconf publishing module for the PulseAudio sound server.
> %package module-bluetooth
> Summary:        Bluetooth support for the PulseAudio sound server
> Requires:       %{name} = %{version}-%{release}
>+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
> Requires:       bluez%{?bluez5: >= 5.0}
> 
> %description module-bluetooth
>@@ -141,6 +145,7 @@ Contains Bluetooth audio (A2DP/HSP/HFP) support for the PulseAudio sound server.
> %package module-jack
> Summary:        JACK support for the PulseAudio sound server
> Requires:       %{name}%{?_isa} = %{version}-%{release}
>+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
> 
> %description module-jack
> JACK sink and source modules for the PulseAudio sound server.
>@@ -149,6 +154,7 @@ JACK sink and source modules for the PulseAudio sound server.
> %package module-gconf
> Summary:        GConf support for the PulseAudio sound server
> Requires:       %{name}%{?_isa} = %{version}-%{release}
>+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
> 
> %description module-gconf
> GConf configuration backend for the PulseAudio sound server.
>@@ -240,6 +246,10 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
>   --disable-neon-opt \
> %endif
>   --enable-systemd \
>+%if 0%{?rhel}
>+  --disable-lirc \
>+  --disable-jack \
>+%endif
> %if 0%{?with_webrtc}
>   --enable-webrtc-aec \
> %endif
>@@ -507,6 +517,10 @@ exit 0
> %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
> 
> %changelog
>+* Wed Jan 22 2014 Wim Taymans <wtaymans@redhat.com> - 4.0-10.gitf81e3
>+- Don't build jack and lirc on rhel
>+- Add more Requires to avoid testing against multiple versions
>+
> * Sat Dec 07 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.0-9.gitf81e3
> - X-KDE-autostart-phase=1
> 
>-- 
>1.8.4.2
>

Actions: View | Diff

Attachments on bug 1056619: 853904