From a1d08ade8d28fd4f63160c099d992b36df1ebc5b2a8a16ace1db45343150120c Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Tue, 17 Sep 2013 14:09:39 +0000
Subject: [PATCH] osc copypac from project:openSUSE:Factory package:pulseaudio
 revision:103

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pulseaudio?expand=0&rev=105
---
 pulseaudio-4.0-140-gbf9b3.tar.xz |  3 ---
 pulseaudio-4.0.tar.xz            |  3 +++
 pulseaudio.changes               |  7 -------
 pulseaudio.spec                  | 20 ++++++++++----------
 4 files changed, 13 insertions(+), 20 deletions(-)
 delete mode 100644 pulseaudio-4.0-140-gbf9b3.tar.xz
 create mode 100644 pulseaudio-4.0.tar.xz

diff --git a/pulseaudio-4.0-140-gbf9b3.tar.xz b/pulseaudio-4.0-140-gbf9b3.tar.xz
deleted file mode 100644
index 8851e94..0000000
--- a/pulseaudio-4.0-140-gbf9b3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:314af4d7d6be94097de613646280140f43de939c434d71440dd3eea696123181
-size 1382144
diff --git a/pulseaudio-4.0.tar.xz b/pulseaudio-4.0.tar.xz
new file mode 100644
index 0000000..d95f3a7
--- /dev/null
+++ b/pulseaudio-4.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:35ceb36bb1822fe54f0b5e4863b4f486769fdfb8ff2111f01fd8778928f9cdae
+size 1392072
diff --git a/pulseaudio.changes b/pulseaudio.changes
index 346980f..d100902 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,10 +1,3 @@
--------------------------------------------------------------------
-Sat Sep  7 11:30:40 UTC 2013 - dimstar@opensuse.org
-
-- Update to git snapshot (rev: gbf9b3)/ bluez5 branch.
-  Note: this is not HEAD of the bluez5 branch, as in local tests,
-  this did fail to load the bluetooth modules.
-
 -------------------------------------------------------------------
 Wed Aug 21 09:38:49 UTC 2013 - dimstar@opensuse.org
 
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 98e27ce..ba267c7 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -17,9 +17,8 @@
 
 
 Name:           pulseaudio
-Version:        4.0+git
+Version:        4.0
 Release:        0
-%define _version 4.0-140-gbf9b3
 %define drvver  4.0
 %define soname  0
 %define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
@@ -28,8 +27,7 @@ Summary:        A Networked Sound Server
 License:        GPL-2.0+ and LGPL-2.1+
 Group:          System/Sound Daemons
 Url:            http://pulseaudio.org
-# git clone of http://cgit.freedesktop.org/pulseaudio/pulseaudio/log/?h=bluez5
-Source:         %{name}-%{_version}.tar.xz
+Source:         http://www.freedesktop.org/software/pulseaudio/releases/%{name}-%{version}.tar.xz
 Source1:        default.pa-for-gdm
 Source2:        setup-pulseaudio
 Source3:        sysconfig.sound-pulseaudio
@@ -42,7 +40,7 @@ Patch2:         pulseaudio-wrong-memset.patch
 BuildRequires:  pkgconfig(systemd)
 %endif
 BuildRequires:  alsa-devel >= 1.0.24
-BuildRequires:  bluez-devel >= 5
+BuildRequires:  bluez-devel >= 4.99
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -67,6 +65,8 @@ BuildRequires:  tcpd-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-devel
+# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
+BuildRequires:  xz
 BuildRequires:  pkgconfig(dbus-1) >= 1.4.12
 BuildRequires:  pkgconfig(gconf-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
@@ -162,7 +162,7 @@ This package includes support for Jack-based applications.
 Summary:        Bluetooth support for the PulseAudio sound server
 Group:          System/Sound Daemons
 Requires:       %{name} = %{version}
-Requires:       bluez >= 5
+Requires:       bluez >= 4.99
 
 %description module-bluetooth
 pulseaudio is a networked sound server for Linux and other Unix like
@@ -263,13 +263,14 @@ This package contains GDM integration hooks for the PulseAudio sound server.
 
 %lang_package
 %prep
-%setup -q -T -b0 -n %{name}-%{_version}
+%setup -q -T -b0
+translation-update-upstream
 %patch0
 %patch1 -p1
 %patch2
 
 %build
-NOCONFIGURE=1 ./bootstrap.sh
+autoreconf -fiv
 %configure \
         --disable-static \
         --disable-rpath \
@@ -281,8 +282,7 @@ NOCONFIGURE=1 ./bootstrap.sh
         --with-system-group=pulse \
         --with-access-group=pulse-access \
         --disable-hal-compat \
-        --with-udev-rules-dir=%{_udevrulesdir} \
-        --enable-bluez5 --disable-bluez4
+        --with-udev-rules-dir=%{_udevrulesdir}
 make %{?_smp_mflags} V=1
 make doxygen