diff --git a/pulseaudio-7.0-localedir.patch b/pulseaudio-7.0-localedir.patch deleted file mode 100644 index 3d4b295..0000000 --- a/pulseaudio-7.0-localedir.patch +++ /dev/null @@ -1,24 +0,0 @@ -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" - diff --git a/pulseaudio.spec b/pulseaudio.spec index 81e64ce..346e3a8 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -1,5 +1,5 @@ -%global pa_major 7.1 -#global pa_minor +%global pa_major 7.99 +%global pa_minor 1 #global snap 20141103 #global gitrel 327 @@ -42,8 +42,6 @@ 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) @@ -229,9 +227,6 @@ 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/' \ @@ -562,6 +557,9 @@ exit 0 %changelog +* Mon Dec 28 2015 Rex Dieter - 7.99.1 +- pulseaudio-7.99.1 (8.0 rc1) + * Sat Oct 31 2015 Rex Dieter - 7.1-1 - pulseaudio-7.1 (#1276811) diff --git a/sources b/sources index 160b8ff..4b54d27 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -9d0a9817b632cac8e3f3834d7eb1c99d pulseaudio-7.1.tar.xz -b553082c311808f844d8ccedf7b08ef4 pulseaudio-7.1.tar.xz.md5 -759198e3e0e55311ba1bcb85f859e97c pulseaudio-7.1.tar.xz.sha1 +257bf53e4cb00227d7d1abb964655c7c pulseaudio-7.99.1.tar.xz +a3627182255bf2aa24d3057684214451 pulseaudio-7.99.1.tar.xz.md5 +4423c108548b88dcd8ff745ea355ad91 pulseaudio-7.99.1.tar.xz.sha1