PulseAudio doesn't load locales (fdo#92142)

This commit is contained in:
Rex Dieter 2015-09-27 18:33:06 -05:00
parent 675e8a1777
commit 0b6371c5ac
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,24 @@
diff -up pulseaudio-7.0/configure.ac.localedir pulseaudio-7.0/configure.ac
--- pulseaudio-7.0/configure.ac.localedir 2015-09-16 21:47:47.000000000 -0500
+++ pulseaudio-7.0/configure.ac 2015-09-27 18:11:47.719668163 -0500
@@ -110,7 +110,7 @@ AC_SUBST([GETTEXT_PACKAGE])
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
pulselocaledir='${prefix}/${DATADIRNAME}/locale'
-AX_DEFINE_DIR(PULSE_LOCALEDIR, pulselocaledir, [Gettext locale dir])
+AX_DEFINE_DIR(PULSE_LOCALEDIR, localedir, [Gettext locale dir])
else
# workaround till an intltool m4 bug is fixed upstream
# (https://bugs.launchpad.net/intltool/+bug/904647)
diff -up pulseaudio-7.0/configure.localedir pulseaudio-7.0/configure
--- pulseaudio-7.0/configure.localedir 2015-09-27 18:04:46.606210648 -0500
+++ pulseaudio-7.0/configure 2015-09-27 18:10:17.603152941 -0500
@@ -8939,7 +8939,7 @@ pulselocaledir='${prefix}/${DATADIRNAME}
exec_prefix_NONE=
test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
- eval ax_define_dir="\"$pulselocaledir\""
+ eval ax_define_dir="\"$localedir\""
eval ax_define_dir="\"$ax_define_dir\""
PULSE_LOCALEDIR="$ax_define_dir"

View File

@ -19,7 +19,7 @@
Name: pulseaudio
Summary: Improved Linux Sound Server
Version: %{pa_major}%{?pa_minor:.%{pa_minor}}
Release: 1%{?snap:.%{snap}git%{shortcommit}}%{?dist}
Release: 2%{?snap:.%{snap}git%{shortcommit}}%{?dist}
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/PulseAudio
%if 0%{?gitrel}
@ -42,6 +42,8 @@ Patch1: pulseaudio-autostart.patch
## upstream patches
## upstreamable patches
# https://bugs.freedesktop.org/show_bug.cgi?id=92142
Patch50: pulseaudio-7.0-localedir.patch
BuildRequires: automake libtool
BuildRequires: pkgconfig(bash-completion)
@ -227,6 +229,9 @@ This package contains GDM integration hooks for the PulseAudio sound server.
%setup -q -T -b0 -n %{name}-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}}
%patch1 -p1 -b .autostart
%patch50 -p1 -b .localedir
# avoid re-autoconf'ing from patch50
touch configure.ac --reference=configure.ac.localedir
sed -i.no_consolekit -e \
's/^load-module module-console-kit/#load-module module-console-kit/' \
@ -557,6 +562,9 @@ exit 0
%changelog
* Sun Sep 27 2015 Rex Dieter <rdieter@fedoraproject.org> - 7.0-2
- PulseAudio doesn't load locales (fdo#92142)
* Wed Sep 23 2015 Rex Dieter <rdieter@fedoraproject.org> - 7.0-1
- pulseaudio-7.0